diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
index f22a9c7af1a..66eaba2113b 100644
--- a/src/main/java/tconstruct/tools/TinkerTools.java
+++ b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -251,7 +251,7 @@ public void preInit (FMLPreInitializationEvent event)
         TinkerTools.hammerHead = new DynamicToolPart("_hammer_head", "HammerHead");
 
         TinkerTools.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring");
-        TinkerTools.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead");
+        TinkerTools.arrowhead = new DynamicToolPart("_arrowhead", "ArrowHead");
         TinkerTools.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching");
 
         Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.bowstring, TinkerTools.fletching, TinkerTools.arrowhead };
diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java
index 796bbecd134..2a7b226ccad 100644
--- a/src/main/java/tconstruct/tools/items/ToolPart.java
+++ b/src/main/java/tconstruct/tools/items/ToolPart.java
@@ -25,7 +25,9 @@ public ToolPart(String textureType, String name)
     @Override
     public String getItemStackDisplayName (ItemStack par1ItemStack)
     {
-        String material = toolTextureNames[par1ItemStack.getItemDamage()];
+        String material = "";
+        if(par1ItemStack.getItemDamage() < toolTextureNames.length)
+            material = toolTextureNames[par1ItemStack.getItemDamage()];
         String name = "";
         
         if (StatCollector.canTranslate("toolpart." + partName + "." + material))