diff --git a/ReallifeGamemode.Server/Events/EnterVehicle.cs b/ReallifeGamemode.Server/Events/EnterVehicle.cs
index 0ac95d38..1ae08f5a 100644
--- a/ReallifeGamemode.Server/Events/EnterVehicle.cs
+++ b/ReallifeGamemode.Server/Events/EnterVehicle.cs
@@ -22,12 +22,15 @@ namespace ReallifeGamemode.Server.Events
       if (vehicle.HasMarkerBehind())
         vehicle.RemoveMarkerBehind();
 
-      if (!VehicleManager.lastDriversInVehicle.ContainsKey(vehicle))
+      if(vehicle != null && !string.IsNullOrEmpty(client.Name))
       {
-        VehicleManager.lastDriversInVehicle.Add(vehicle, new Dictionary<string, DateTime>());
-      }
+        if (!VehicleManager.lastDriversInVehicle.ContainsKey(vehicle))
+        {
+          VehicleManager.lastDriversInVehicle.Add(vehicle, new Dictionary<string, DateTime>());
+        }
 
-      VehicleManager.lastDriversInVehicle[vehicle][client.Name] = DateTime.Now;
+        VehicleManager.lastDriversInVehicle[vehicle][client.Name] = DateTime.Now;
+      }
 
       if (vehicle.GetServerVehicle() is FactionVehicle veh)
       {