diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
index 563aeb73b..9a8e6ecdf 100644
--- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
+++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
@@ -1890,6 +1890,9 @@ public class SlimefunSetup {
 									ItemStack log = p.getInventory().getItemInMainHand();
 									
 									ItemStack item =  new ItemStack(MaterialHelper.getWoodFromLog(log.getType()), 8);
+									if(item == null || item.getType() == Material.AIR) {
+										return false;
+									}
 									b.getWorld().dropItemNaturally(b.getLocation(), item);
 									b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, log.getType());
 									log.setAmount(log.getAmount() -1);