diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 69410223..db385cb1 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Events
       player.SetData("isDead", true);
 
       //TODO: Zum Full Release entfernen
-      ChatService.SendMessage(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString());
+      ChatService.SendMessage(player, "Du bist durch " + killer?.Name ?? "Niemanden" + " gestorben: " + reason.ToString());
 
       int? killerId;
       float killerPosX;
@@ -35,7 +35,7 @@ namespace ReallifeGamemode.Server.Events
       float killerPosZ;
       float killerHeading;
 
-      if (killer.IsNull)
+      if (killer == null || killer.IsNull)
       {
         killerId = null;
         killerPosX = -1;