diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 71d5e82b93e..ce9e95495ac 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -158,6 +158,8 @@
 /obj/item/storage/proc/show_to(mob/user)
 	if(!user.client)
 		return
+	if(QDELETED(src))
+		return
 	if(user.s_active != src && !isobserver(user))
 		for(var/obj/item/I in src) // For bombs with mousetraps, facehuggers etc
 			if(I.on_found(user))
@@ -466,7 +468,7 @@
 
 	if(usr)
 		orient2hud(usr)
-		if(usr.s_active)
+		if(usr.s_active && !QDELETED(src))
 			usr.s_active.show_to(usr)
 	if(W.maptext)
 		W.maptext = ""