From d135f6446440cad249616f3b9578e8c700e87900 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Mon, 7 Aug 2017 18:58:41 +0100
Subject: [PATCH] Crash prevention

---
 src/p_mobj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index f95d5a0a5..60f569e5a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6546,7 +6546,7 @@ maceretry:
 
 	P_SetThingPosition(mobj);
 
-	if (donetwice)
+	if (donetwice || P_MobjWasRemoved(mobj))
 		return;
 
 	if (mobj->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT))