diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index f54f5d1dfb8..49d5c4cdd33 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -376,7 +376,7 @@ var/list/DummyCache = list()
 	while(candidates.len <= 0 && i < 5)
 		roleselect_debug("get_active_candidates(role_id=[role_id], buffer=[buffer], poll=[poll]): Player list is [player_list.len] items long.")
 		for(var/mob/dead/observer/G in player_list)
-			if(!G.mind || (G.mind.current && G.mind.current.stat != DEAD))
+			if(G.mind && G.mind.current && G.mind.current.stat != DEAD)
 				roleselect_debug("get_active_candidates(role_id=[role_id], buffer=[buffer], poll=[poll]): Skipping [G]  - Shitty candidate.")
 				continue
 
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 303fa1dcae4..8b9b6aef69d 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -335,7 +335,7 @@
 		else
 			user << "<span class='notice'> You're a robot. No.</span>"
 			return //Robots can't interact with storage items.
-	
+
 
 	if(!can_be_inserted(W))
 		return
@@ -395,6 +395,9 @@
 	src.add_fingerprint(user)
 	return
 
+/obj/item/weapon/storage/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
 /obj/item/weapon/storage/verb/toggle_gathering_mode()
 	set name = "Switch Gathering Method"
 	set category = "Object"