diff --git a/fml/common/cpw/mods/fml/common/registry/ItemData.java b/fml/common/cpw/mods/fml/common/registry/ItemData.java
index cc73b2866..f17399227 100644
--- a/fml/common/cpw/mods/fml/common/registry/ItemData.java
+++ b/fml/common/cpw/mods/fml/common/registry/ItemData.java
@@ -132,6 +132,12 @@ public class ItemData {
 
     public void setName(String name, String modId)
     {
+        if (name == null)
+        {
+            this.forcedName = null;
+            this.forcedModId = null;
+            return;
+        }
         String localModId = modId;
         if (modId == null)
         {