diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 23cc2d97d7b..890d4d91bbe 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -161,9 +161,13 @@ void MotionMaster::MovementExpired(bool reset /*= true*/)
 MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
 {
     if (empty())
-        return IDLE_MOTION_TYPE;
+        return MAX_MOTION_TYPE;
 
-    return top()->GetMovementGeneratorType();
+    MovementGenerator* movement = top();
+    if (!movement)
+        return MAX_MOTION_TYPE;
+
+    return movement->GetMovementGeneratorType();
 }
 
 MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const