diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index ac539a5ab1c..630600199f8 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -166,7 +166,6 @@
 	W.loc = src
 	if ((user.client && user.s_active != src))
 		user.client.screen -= W
-	src.orient2hud(user)
 	W.dropped(user)
 	add_fingerprint(user)
 
@@ -178,6 +177,8 @@
 		else if(contents.len >= 15)
 			src.icon_state = "giftbag2"
 
+	src.orient2hud(user)
+	src.show_to(user)
 	if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
 	for(var/mob/M in viewers(user, null))
 		if (M == user)
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 7c1318c438d..ff88591efb9 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -111,7 +111,8 @@
 				client.screen -= W
 			W.loc = loc
 			W.dropped(src)
-			W.layer = initial(W.layer)
+			if(W)
+				W.layer = initial(W.layer)
 
 	update_action_buttons()
 	return 1