From 414586c29982a992aacafca54e90ad8f5b3ceb5a Mon Sep 17 00:00:00 2001
From: AnturK <AnturK@users.noreply.github.com>
Date: Wed, 8 Nov 2017 20:49:26 +0100
Subject: [PATCH] Fixes orbit (#32536)

---
 code/modules/orbit/orbit.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/orbit/orbit.dm b/code/modules/orbit/orbit.dm
index 2ddd4d59cee..fcee36c9350 100644
--- a/code/modules/orbit/orbit.dm
+++ b/code/modules/orbit/orbit.dm
@@ -44,7 +44,7 @@
 		orbiter.orbiting = src //set it back to us first
 		orbiter.stop_orbit()
 	var/atom/movable/AM = orbiting
-	if(istype(AM) && AM.orbiting.orbiting == orbiter)
+	if(istype(AM) && AM.orbiting && AM.orbiting.orbiting == orbiter)
 		orbiter.stop_orbit()
 		return
 	lastprocess = world.time