diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java
index 34ed53d..aa17ff9 100644
--- a/src/main/java/de/diddiz/LogBlock/Consumer.java
+++ b/src/main/java/de/diddiz/LogBlock/Consumer.java
@@ -280,7 +280,8 @@ public class Consumer extends Thread {
             weapon = ((Player) killer).getInventory().getItemInMainHand();
         }
         if (killer instanceof Projectile) {
-            weapon = new ItemStack(itemIDfromProjectileEntity(killer));
+            Material projectileMaterial = itemIDfromProjectileEntity(killer);
+            weapon = projectileMaterial == null ? null : new ItemStack(projectileMaterial);
             ProjectileSource ps = ((Projectile) killer).getShooter();
             if (ps == null) {
                 killerActor = Actor.actorFromEntity(killer);
diff --git a/src/main/java/de/diddiz/LogBlock/Kill.java b/src/main/java/de/diddiz/LogBlock/Kill.java
index 819d32b..fc08156 100755
--- a/src/main/java/de/diddiz/LogBlock/Kill.java
+++ b/src/main/java/de/diddiz/LogBlock/Kill.java
@@ -43,8 +43,10 @@ public class Kill implements LookupCacheElement {
         if (loc != null) {
             msg.append(" at ").append(loc.getBlockX()).append(":").append(loc.getBlockY()).append(":").append(loc.getBlockZ());
         }
-        String weaponName = prettyItemName(MaterialConverter.getMaterial(weapon));
-        msg.append(" with " + weaponName); // + ("aeiou".contains(weaponName.substring(0, 1)) ? "an " : "a " )
+        if (weapon != 0) {
+            String weaponName = prettyItemName(MaterialConverter.getMaterial(weapon));
+            msg.append(" with " + weaponName); // + ("aeiou".contains(weaponName.substring(0, 1)) ? "an " : "a " )
+        }
         return msg.toString();
     }