diff --git a/Client/Business/cardealer.js b/Client/Business/cardealer.js
index 179e67e9..48951ec3 100644
--- a/Client/Business/cardealer.js
+++ b/Client/Business/cardealer.js
@@ -16,6 +16,7 @@ var shopMenu;
 
 mp.events.add('ShopVehicle_OpenMenu', (businessName, price) => {
     var veh = mp.players.local.vehicle;
+    if (!veh) return;
     mp.gui.chat.show(false);
     shopMenu = new Menu("Fahrzeugkauf", "Kaufe ein neues Auto", new Point(50, 50));
 
diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index 1641c5cc..4b7f0fb6 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -675,7 +675,9 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            target.Position = new Vector3(target.Position.X, target.Position.Y, target.Position.Z + wert);
+            Vector3 oldPos = target.Position;
+
+            target.Position = new Vector3(oldPos.X, oldPos.Y, oldPos.Z + wert);
             player.SendChatMessage("Du hast " + target.Name + " geslappt. Höhe: " + wert + "");
         }
 
@@ -1543,7 +1545,8 @@ namespace reallife_gamemode.Server.Commands
                         vehicle = SaveManager.SaveShopVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.DisplayName, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
                             Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), business, price);
                         player.SendNotification("Shopfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
-                        player.Position = player.Position.Add(new Vector3(0, 0, 2));
+                        Vector3 oldPos = player.Position;
+                        player.Position = new Vector3(oldPos.X, oldPos.Y, oldPos.Z + 2.5);
                     }
                     else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
                     break;