diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 15af42c2..22b9e783 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -963,7 +963,7 @@ namespace ReallifeGamemode.Server.Events
     }
 
     [RemoteEvent("keyPress:Z")]
-    public void KeyPressX(Player player)
+    public void KeyPressZ(Player player)
     {
       if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
 
diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs
index b35b9dd3..ff21e6d8 100644
--- a/ReallifeGamemode.Server/Events/Vehicle.cs
+++ b/ReallifeGamemode.Server/Events/Vehicle.cs
@@ -140,14 +140,9 @@ namespace ReallifeGamemode.Server.Events
         {
           ServerVehicle carlocked = v.GetServerVehicle(dbContext);
 
-          if (state == true)
+          if (carlocked != null)
           {
-            carlocked.Locked = true;
-            dbContext.SaveChanges();
-          }
-          else
-          {
-            carlocked.Locked = false;
+            carlocked.Locked = state;
             dbContext.SaveChanges();
           }
         }
@@ -208,14 +203,9 @@ namespace ReallifeGamemode.Server.Events
         {
           ServerVehicle carlocked = vehicle.GetServerVehicle(dbContext);
 
-          if (state == true)
+          if (carlocked != null)
           {
-            carlocked.Locked = true;
-            dbContext.SaveChanges();
-          }
-          else
-          {
-            carlocked.Locked = false;
+            carlocked.Locked = state;
             dbContext.SaveChanges();
           }
         }