diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index a9c9e70b..2eb39311 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -217,6 +217,8 @@ namespace ReallifeGamemode.Server.Commands
       }
       User targetUser = target.GetUser();
       targetUser.GiveWanteds(player, amount, reason);
+      ChatService.SendMessage(target, "Du hast von "+player.Name+" einen Fahndungslevel von "+amount+" bekommen.");
+      ChatService.SendMessage(target, "Grund: " +reason);
     }
 
     [Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)]
diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index 52acaaf4..97579d4b 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -108,7 +108,8 @@ namespace ReallifeGamemode.Server.Extensions
         User copUser = copPlayer.GetUser();
         if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop != null)
         {
-          ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Grund: " + reason + ". Straftäter: "+ user.Name + ".");
+          ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + ".");
+          ChatService.SendMessage(copPlayer, "~r~HQ: Grund: " + reason + ".");
           ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit "+ user.Wanteds +" gesucht.");
         }
         else if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop == null)
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 1eabcba9..66b5df9a 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -46,11 +46,13 @@ namespace ReallifeGamemode.Server.Wanted
             {
               if(!client.HasData("isDead") || client.GetData("isDead") == false)
               {
-                client.GetUser(dbContext).JailTime = (user.Wanteds * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds            
+                client.GetUser(dbContext).JailTime = (user.Wanteds * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds       
+                Jailtime[user.Id] = (user.JailTime * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
               }
               else
               {
-                client.GetUser(dbContext).JailTime = (user.Wanteds * 54);
+                client.GetUser(dbContext).JailTime = user.Wanteds * 54;
+                Jailtime[user.Id] = user.JailTime * 54; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
               }
               client.GetUser(dbContext).Wanteds = 0;
               dbContext.SaveChanges();
@@ -77,12 +79,12 @@ namespace ReallifeGamemode.Server.Wanted
               User copUser = copPlayer.GetUser();
               if ((copUser.FactionId == 1 || copUser.FactionId == 3))
               {
-                ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Knast zugewiesen.");
+                ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.");
               }
             }
-
-            ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " sekunden.");
-            Jailtime[user.Id] = user.Wanteds * 54; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
+           
+            ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " Sekunden.");
+           
           }
         }
       }
diff --git a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
index a1860c5c..2e2e9390 100644
--- a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
+++ b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
@@ -43,7 +43,7 @@ namespace ReallifeGamemode.Server.Wanted
       foreach (var player in NAPI.Pools.GetAllPlayers())
       {
         User user = player.GetUser();
-        if (user.Wanteds > 0)
+        if (user != null && user.Wanteds > 0)
         {
           if (!waTimer.ContainsKey(user.Id))
             ResetWantedTimeToElapse(player);