diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java
index 7f8afbf..683e9cd 100644
--- a/src/main/java/de/diddiz/LogBlock/Consumer.java
+++ b/src/main/java/de/diddiz/LogBlock/Consumer.java
@@ -309,7 +309,7 @@ public class Consumer extends TimerTask {
         if (victim == null || !isLogged(location.getWorld())) {
             return;
         }
-        queue.add(new KillRow(location, killer == null ? null : killer, victim, MaterialConverter.getOrAddMaterialId(weapon.getType().getKey().toString())));
+        queue.add(new KillRow(location, killer == null ? null : killer, victim, weapon == null ? 0 : MaterialConverter.getOrAddMaterialId(weapon.getType().getKey().toString())));
     }
 
     /**