diff --git a/client/texture/ExtraBlockTextures.java b/client/texture/ExtraBlockTextures.java
index d23140aa..3ec1082a 100644
--- a/client/texture/ExtraBlockTextures.java
+++ b/client/texture/ExtraBlockTextures.java
@@ -58,7 +58,7 @@ public enum ExtraBlockTextures
 
 	BlockCraftingAccelerator("BlockCraftingAccelerator"), BlockCraftingMonitor("BlockCraftingMonitor"),
 
-	BlockCraftingStorage1k("BlockCraftingStorage1k"), BlockCraftingStorage4k("BlockCraftingStorage4k"), BlockCraftingStorage16k("BlockCraftingStorage16k"), BlockCraftingStorage64k(
+	BlockCraftingStorage1k("BlockCraftingStorage"), BlockCraftingStorage4k("BlockCraftingStorage4k"), BlockCraftingStorage16k("BlockCraftingStorage16k"), BlockCraftingStorage64k(
 			"BlockCraftingStorage64k"),
 
 	BlockCraftingAcceleratorFit("BlockCraftingAcceleratorFit"), BlockCraftingMonitorFit("BlockCraftingMonitorFit"),
diff --git a/items/materials/ItemMultiMaterial.java b/items/materials/ItemMultiMaterial.java
index 24446bcd..e71b0ce6 100644
--- a/items/materials/ItemMultiMaterial.java
+++ b/items/materials/ItemMultiMaterial.java
@@ -201,7 +201,7 @@ public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent,
 	{
 		for (MaterialType mat : MaterialType.values())
 		{
-			if ( mat.damageValue != -1 )
+			if ( mat.damageValue != -1 && mat != MaterialType.InvalidType )
 			{
 				String tex = "appliedenergistics2:" + nameOf( new ItemStack( this, 1, mat.damageValue ) );
 				mat.IIcon = icoRegister.registerIcon( tex );