diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 78cf9617fd3..c55684eb197 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -113,9 +113,10 @@
 		var/datum/organ/external/temp = user:organs_by_name["r_hand"]
 		if (user.hand)
 			temp = user:organs_by_name["l_hand"]
-		if(temp && temp.status & ORGAN_DESTROYED)
-			user << "<span class = 'warning'> Yo- wait a minute."
+		if(temp && !temp.is_usable())
+			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
 			return
+
 	if (istype(src.loc, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = src.loc
 		S.remove_from_storage(src)
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 0e61142b9c3..dc16e55bd0c 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -114,7 +114,7 @@
 						del(spark_system)
 
 		else if(E.name in list("l_leg","l_foot","r_leg","r_foot") && !lying)
-			if (E.status & ORGAN_DESTROYED || malfunction || (broken && !(E.status & ORGAN_SPLINTED)))
+			if (!E.is_usable() || malfunction || (broken && !(E.status & ORGAN_SPLINTED)))
 				leg_tally--			// let it fail even if just foot&leg
 
 	// standing is poor