diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 172e9d22..06950ead 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -117,11 +117,11 @@ namespace ReallifeGamemode.Server.Events
       {
         if (job.GetUsersInJob().Contains(player))
         {
-          if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
+          if (player.Vehicle != null)
           {
             /*if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
             {*/
-              if (player.Vehicle != null)
+              if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
               {
                 player.Vehicle.ResetData("timerJobVehicleRespawn");
                 ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
@@ -134,11 +134,14 @@ namespace ReallifeGamemode.Server.Events
           {
             jm.playerTimersJobVehicleRespawn[player].Stop();
           }
-          player.ResetData("HatRoute");
           player.ResetData("PilotenBase");
           job.StopJob(player);
           ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
-          CheckPointHandle.DeleteCheckpoints(player);
+          if (player.GetData<bool>("HatRoute") == true)
+          {
+            CheckPointHandle.DeleteCheckpoints(player);
+            player.ResetData("HatRoute");
+          }
         }
       }
 
diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index 105f8c98..6bb04094 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -60,11 +60,11 @@ namespace ReallifeGamemode.Server.Events
       {
         if (job.GetUsersInJob().Contains(player))
         {
-          if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
+          if (player.Vehicle != null)
           {
             //if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
             //{
-              if (player.Vehicle != null)
+              if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
               {
                 player.Vehicle.ResetData("timerJobVehicleRespawn");
                 ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
@@ -77,12 +77,14 @@ namespace ReallifeGamemode.Server.Events
           {
             jm.playerTimersJobVehicleRespawn[player].Stop();
           }
-          player.ResetData("HatRoute");
           player.ResetData("PilotenBase");
-          player.ResetData("JobVehicleFrei");
           job.StopJob(player);
-          //ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
-          CheckPointHandle.DeleteCheckpoints(player);
+          ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
+          if (player.GetData<bool>("HatRoute") == true)
+          {
+            CheckPointHandle.DeleteCheckpoints(player);
+            player.ResetData("HatRoute");
+          }
         }
       }