diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs
index fe88f4bb..528e000c 100644
--- a/ReallifeGamemode.Server/Managers/InventoryManager.cs
+++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs
@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Managers
       using (var context = new DatabaseContext())
       {
         ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh, context);
-        List<VehicleItem> vehItems = context.VehicleItems.ToList().FindAll(i => i.VehicleId == serverVehicle.Id);
+        List<VehicleItem> vehItems = context.VehicleItems.Where(i => i.VehicleId == serverVehicle.Id).ToList();
         foreach (var item in vehItems)
         {
           IItem iItem = GetItemById(item.ItemId);
@@ -609,7 +609,7 @@ namespace ReallifeGamemode.Server.Managers
         }
         user.Handmoney -= shopItem.Price;
         dbContext.SaveChanges();
-      //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
+        //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
       }
     }
   }
diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index abf9dd87..a291db1b 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -271,7 +271,7 @@ namespace ReallifeGamemode.Server.Managers
       {
         //Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
         Vehicle LastVehicle = veh;
-        JobBase job = GetJob(player.GetUser().JobId ?? -1);
+        JobBase job = GetJob(player?.GetUser()?.JobId ?? -1);
         if (LastVehicle == null || job == null)
         {
           return;
@@ -531,10 +531,12 @@ namespace ReallifeGamemode.Server.Managers
               playerTimersJobVehicleRespawn[player].Stop();
             }
             CheckPointHandle.DeleteCheckpoints(player);
-            if (!player.HasData("LastVehicle")){
+            if (!player.HasData("LastVehicle"))
+            {
               return;
             }
-            if (player.GetData<Vehicle>("LastVehicle") == null) {
+            if (player.GetData<Vehicle>("LastVehicle") == null)
+            {
               return;
             }
             player.GetData<Vehicle>("LastVehicle").ResetData("timerJobVehicleRespawn");