diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm
index c1f148c3f2a..94b1c7b2762 100644
--- a/code/game/objects/items/weapons/guns_ammo.dm
+++ b/code/game/objects/items/weapons/guns_ammo.dm
@@ -488,8 +488,12 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 
 /obj/item/weapon/gun/detectiverevolver/attack(mob/M as mob, mob/user as mob)
 	src.add_fingerprint(user)
-//	var/mob/living/carbon/human/H = M
-	var/detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && istype(H.head, /obj/item/clothing/head/det_hat)  && istype(H.wear_suit, /obj/item/clothing/suit/det_suit))
+	var/mob/living/carbon/human/H = user
+	var/detective
+	if(!istype(H))
+		detective = 0
+	else
+		detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && istype(H.head, /obj/item/clothing/head/det_hat)  && istype(H.wear_suit, /obj/item/clothing/suit/det_suit))
 
 // ******* Check