From 4bc01691d718d0ef8fdb54f2ed2ce8d551979c00 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Mon, 19 Jul 2021 17:42:16 -0400
Subject: [PATCH] Fixes #11151

---
 code/game/objects/items/weapons/storage/storage.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 74ce48948f..73f8b7728e 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -529,7 +529,10 @@
 		F.update_icon(1)
 
 	for(var/mob/M in is_seeing)
-		M?.client.screen -= W
+		if(!M.client || QDELETED(M))
+			hide_from(M)
+		else
+			M.client.screen -= W
 
 	if(new_location)
 		if(ismob(loc))