diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 75c579855ad..a00e139c27a 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1432,7 +1432,7 @@ B --><-- A
 	var/angle = 0
 	var/matrix/initial_transform = matrix(transform)
 	spawn
-		while(orbiting)
+		while(orbiting && orbiting.loc)
 			loc = orbiting.loc
 
 			angle += angle_increment