diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index ca73867902f..eb4b7671d71 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -69,10 +69,8 @@
 
 /turf/space/Entered(atom/movable/A as mob|obj)
 	..()
-	if ((!(A) || src != A.loc))
-		return
-
-	if(destination_z)
+	
+	if(destination_z && A && (src in A.locs))
 		A.x = destination_x
 		A.y = destination_y
 		A.z = destination_z
@@ -200,4 +198,4 @@
 	return
 
 /turf/space/can_have_cabling()
-	return 0
\ No newline at end of file
+	return 0