diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index cd4b79a4f58..47e0740be4b 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -56,7 +56,7 @@
 
 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
 /obj/item/weapon/grab/proc/throw()
-	if(affecting)
+	if(affecting && assailant.Adjacent(affecting))
 		if(affecting.buckled)
 			return null
 		if(state >= GRAB_AGGRESSIVE)
@@ -80,6 +80,9 @@
 		assailant.client.screen -= hud
 		assailant.client.screen += hud
 
+	var/hit_zone = assailant.zone_sel.selecting
+	last_hit_zone = hit_zone
+
 	if(assailant.pulling == affecting)
 		assailant.stop_pulling()
 
@@ -117,11 +120,10 @@
 		affecting.drop_item()
 		affecting.hand = h
 
-		var/hit_zone = assailant.zone_sel.selecting
+
 		//var/announce = 0
 		//(hit_zone != last_hit_zone)
 			//announce = 1
-		last_hit_zone = hit_zone
 	/*	if(ishuman(affecting))
 			switch(hit_zone)
 				/*if("mouth")