diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index 359d58d4a92..f2022720cb2 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -909,7 +909,8 @@ bool OPvPWintergrasp::UpdateCreatureInfo(Creature *creature)
             }
             else
             {
-                creature->GetVehicleKit()->RemoveAllPassengers();
+                if (creature->IsVehicle() && creature->GetVehicleKit())
+                    creature->GetVehicleKit()->RemoveAllPassengers();
                 creature->SetVisibility(VISIBILITY_OFF);
                 creature->setFaction(35);
             }