diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java b/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java
index eb2be1412c..f389f6d84e 100644
--- a/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java
+++ b/fml/src/main/java/cpw/mods/fml/common/registry/GameData.java
@@ -63,7 +63,8 @@ public class GameData {
 
     static Block findBlock(String modId, String name)
     {
-        return (Block) blockRegistry.func_82594_a(modId + ":" + name);
+        String key = modId + ":" + name;
+        return blockRegistry.contains(key) ? blockRegistry.func_82594_a(key) : null;
     }
 
     static ItemStack findItemStack(String modId, String name)