diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index e10ac54fda1..5cab26e062b 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -305,8 +305,9 @@
 			var/mob/living/silicon/robot/R = loc
 			if(locate(src) in R.module.modules)
 				R.module.modules -= src
-		if(usr)
-			usr.unEquip(src, TRUE)
+		if(ismob(loc))
+			var/mob/living/L = loc // At this stage, stack code is so horrible and atrocious, I wouldn't be all surprised ghosts can somehow have stacks. If this happens, then the world deserves to burn.
+			L.unEquip(src, TRUE)
 		qdel(src)
 		return TRUE
 	return FALSE