diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 38aad9bd646..dd3860f18d9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1872,6 +1872,10 @@
 /mob/living/proc/set_usable_legs(new_value)
 	if(usable_legs == new_value)
 		return
+	if(new_value < 0) // Sanity check
+		stack_trace("[src] had set_usable_legs() called on them with a negative value!")
+		new_value = 0
+
 	. = usable_legs
 	usable_legs = new_value
 
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index cb1155a8324..e905886a9ab 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -322,7 +322,7 @@
 		return FALSE
 	. = TRUE
 	moveToNullspace()
-	owner = new_limb_owner
+	set_owner(new_limb_owner)
 	new_limb_owner.add_bodypart(src)
 	if(held_index)
 		if(held_index > new_limb_owner.hand_bodyparts.len)