diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 4f45de3d156..d0cc5a94a6d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -179,6 +179,12 @@
 	var/mob/living/carbon/human/user = AM
 	if(!HAS_TRAIT(user, TRAIT_SKITTISH))
 		return
+	if(QDELETED(src))
+		return
+	if(!user.can_use_hands())
+		return
+	if(user.stat != CONSCIOUS)
+		return
 	if(user.m_intent != MOVE_INTENT_RUN)
 		return
 	if(!COOLDOWN_FINISHED(user, skittish_cooldown))
@@ -188,7 +194,7 @@
 		return
 	locked = FALSE
 	if(opened || open())
-		user.forceMove(src)
+		user.forceMove(loc)
 		close()
 		COOLDOWN_START(user, skittish_cooldown, 2 SECONDS)