diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 8304a771c6c..11d1e1cd28f 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -154,7 +154,10 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
     if (empty())
         return IDLE_MOTION_TYPE;
 
-    return top()->GetMovementGeneratorType();
+    if (topOrNull())
+        return top()->GetMovementGeneratorType();
+    else
+        return IDLE_MOTION_TYPE;
 }
 
 MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const