diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index 70adc3033..208fd1f41 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -1721,6 +1721,8 @@ namespace Game.Entities
                     ITransport transport = GetDirectTransport();
                     if (transport != null)
                         transport.CalculatePassengerPosition(ref x, ref y, ref z, ref o);
+                    else
+                        return;
                 }
                 if (HasUnitState(UnitState.CannotTurn))
                     o = GetOrientation();