diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java
index 461958d3..6e522b82 100644
--- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java
+++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java
@@ -205,7 +205,7 @@ public class EquipBlock extends InventoryBlock
         {
             EquipLogic logic = (EquipLogic) te;
             ItemStack stack = logic.getEquipmentItem();
-            if (stack != null)
+            if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("InfiTool"))
             {
                 NBTTagCompound tag = stack.getTagCompound().getCompoundTag("InfiTool");