diff --git a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
index f20fc600..aaf43688 100644
--- a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
+++ b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
@@ -67,7 +67,7 @@ namespace ReallifeGamemode.Server.Core.Managers
       else
       {
         //houseBlips[house.Id] = NAPI.Blip.CreateBlip(40, house.Position, 0.7f, 11, "Haus", shortRange: true); too many blips
-        houseBlips[house.Id] = Api.Blip.CreateBlip(40, house.Position, "Haus", 11, 0.7f, shortRange: true);
+        houseBlips[house.Id] = Api.Blip.CreateBlip(40, house.Position, "Haus", 11, 0.5f, shortRange: true);
       }
 
       houseLabels[house.Id] = Api.TextLabel.CreateTextLabel(text, housePos, 10f, 1f, 0, new Color(255, 255, 255));
diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index faeeb590..70d2424c 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Events
 
         user.Dead = true;
 
-        if (!player.HasData("reviveSperre") || !player.HasData("inGangWar") || player.GetData<bool>("SAdminduty") == true)
+        if (!player.HasData("reviveSperre") && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
         {
           //MEDIC AUFTRAG
           MedicTask reviveTask = new MedicTask()
diff --git a/ReallifeGamemode.Server/Gangwar/Gangwar.cs b/ReallifeGamemode.Server/Gangwar/Gangwar.cs
index 0c14b963..b2a3b9b3 100644
--- a/ReallifeGamemode.Server/Gangwar/Gangwar.cs
+++ b/ReallifeGamemode.Server/Gangwar/Gangwar.cs
@@ -40,10 +40,10 @@ namespace ReallifeGamemode.Server.Gangwar
       NAPI.ClientEvent.TriggerClientEventForAll("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray()));
       foreach (var l in NAPI.Pools.GetAllPlayers())
       {
-        if (!l.IsLoggedIn() && !l.GetUser().FactionLeader)
-          return;
-
-        l.TriggerEvent("CLIENT:Turf_LoadLeaderBlip");
+        if (l.IsLoggedIn() && l.GetUser()?.FactionLeader == true)
+        {
+          l.TriggerEvent("CLIENT:Turf_LoadLeaderBlip");
+        }
       }
     }
 
diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs
index e1d9768b..825fe065 100644
--- a/ReallifeGamemode.Server/Gangwar/Turf.cs
+++ b/ReallifeGamemode.Server/Gangwar/Turf.cs
@@ -243,10 +243,22 @@ namespace ReallifeGamemode.Server.Gangwar
       this.timer = null;
       using (var dbContext = new DatabaseContext())
       {
+        Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction?.Name == this.Owner).ToArray();
+        Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction?.Name == this.Attacker).ToArray();
+
+        Faction ownerFaction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).FirstOrDefault();
+        Faction attackerFaction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).FirstOrDefault();
+
+        if (ownerFaction == null || attackerFaction == null)
+        {
+          return;
+        }
+
         if (getOwner() == FactionName)
         {
-          Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray();
-          Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
+          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat erfolgreich das Gebiet  ~g~" + getName() + "~w~ verteidigt.", ownerFaction);
+          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat den Angrif auf das Gebiet ~r~" + getName() + "~w~ verloren.", attackerFaction);
+
           foreach (var o in owners)
           {
             o.TriggerEvent("CLIENT:win");
@@ -255,15 +267,12 @@ namespace ReallifeGamemode.Server.Gangwar
           {
             a.TriggerEvent("CLIENT:loose");
           }
-          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat erfolgreich das Gebiet  ~g~" + getName() + "~w~ verteidigt.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());
-          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion hat den Angrif auf das Gebiet ~r~" + getName() + "~w~ verloren.", dbContext.Factions.Where(f => f.Name == getAttacker()).FirstOrDefault());
-          dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).First().BankAccount.Balance += 15000;
+          ownerFaction.BankAccount.Balance += 15000;
         }
         else if (getOwner() != FactionName)
         {
-          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte das Gebiet ~r~" + getName() + "~w~ nicht verteidigen.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());
-          Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray();
-          Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
+          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte das Gebiet ~r~" + getName() + "~w~ nicht verteidigen.", ownerFaction);
+          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte erfolgreich das Gebiet ~g~" + getName() + "~w~ erobern.", attackerFaction);
           foreach (var o in owners)
           {
             if (o != null)
@@ -275,11 +284,10 @@ namespace ReallifeGamemode.Server.Gangwar
               a.TriggerEvent("CLIENT:win");
           }
           this.Owner = FactionName;
-          ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte erfolgreich das Gebiet ~g~" + getName() + "~w~ erobern.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());
-          dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).First().BankAccount.Balance += 10000;
+          attackerFaction.BankAccount.Balance += 10000;
           Turfs turf = dbContext.Turfs.Where(t => t.Id == getId()).FirstOrDefault();
           turf.Owner = this.Owner;
-          turf.FactionId = dbContext.Factions.Where(f => f.Name == this.Owner).FirstOrDefault().Id;
+          turf.FactionId = attackerFaction.Id;
         }
         dbContext.SaveChanges();
       }