From 7048e4e5abe32df71db170d1db0633454396ee3d Mon Sep 17 00:00:00 2001
From: lolman360 <22850904+lolman360@users.noreply.github.com>
Date: Sat, 21 Dec 2019 12:43:48 +1100
Subject: [PATCH] hhh

---
 code/modules/mob/living/carbon/carbon.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 2a57dd7ae5..84b3bf719b 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -174,9 +174,10 @@
 		if(!throwable_mob && pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE)
 			throwable_mob = pulling
 
-		if(!throwable_mob.buckled)
+		if(throwable_mob && !throwable_mob.buckled)
 			thrown_thing = throwable_mob
-			stop_pulling()
+			if(pulling)
+				stop_pulling()
 			if(HAS_TRAIT(src, TRAIT_PACIFISM))
 				to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
 				return