diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 57c73b06988..132f55b3ab4 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -123,29 +123,29 @@
 
 			if(randn <= 60)
 				//BubbleWrap: Disarming breaks a pull
-				if ( pulling )
+				if(pulling)
 					visible_message("\red <b>[M] has broken [src]'s grip on [pulling]!</B>")
 					talked = 1
 					pulling = null
 
 				//BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
-				var/obj/item/weapon/grab/lgrab = l_hand
-				var/obj/item/weapon/grab/rgrab = r_hand
-				if ( lgrab )
-					if ( lgrab.affecting )
+				if(istype(l_hand, /obj/item/weapon/grab))
+					var/obj/item/weapon/grab/lgrab = l_hand
+					if(lgrab.affecting)
 						visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
 						talked = 1
 					spawn(1)
 						del(lgrab)
-				if ( rgrab )
-					if ( rgrab.affecting )
+				if(istype(r_hand, /obj/item/weapon/grab))
+					var/obj/item/weapon/grab/rgrab = r_hand
+					if(rgrab.affecting)
 						visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
 						talked = 1
 					spawn(1)
 						del(rgrab)
 				//End BubbleWrap
 
-				if( !talked )	//BubbleWrap
+				if(!talked)	//BubbleWrap
 					drop_item()
 					visible_message("\red <B>[M] has disarmed [src]!</B>")
 				playsound(loc, 'thudswoosh.ogg', 50, 1, -1)