diff --git a/common/net/minecraftforge/common/BiomeDictionary.java b/common/net/minecraftforge/common/BiomeDictionary.java
index ace31c7b2e..288d5fb156 100644
--- a/common/net/minecraftforge/common/BiomeDictionary.java
+++ b/common/net/minecraftforge/common/BiomeDictionary.java
@@ -201,18 +201,22 @@ public class BiomeDictionary
      */
     public static void registerAllBiomesAndGenerateEvents()
     {
-        for(int i = 0; i < BIOME_LIST_SIZE; i++)
+        for(int i = 0; i < BiomeGenBase.biomeList.length; i++)
         {
             BiomeGenBase biome = BiomeGenBase.biomeList[i];
+
+            if(biome == null)
+            {
+                continue;
+            }
+
             if (biome.theBiomeDecorator instanceof DeferredBiomeDecorator)
             {
                 DeferredBiomeDecorator decorator = (DeferredBiomeDecorator) biome.theBiomeDecorator;
                 decorator.fireCreateEventAndReplace();
             }
-            if(biome != null)
-            {
-                checkRegistration(biome);
-            }
+
+            checkRegistration(biome);
         }
     }