diff --git a/build.properties b/build.properties
index 3335e2a71..04e2b94a7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
 minecraft_version=1.7.10
-forge_version=10.13.0.1189
+forge_version=10.13.1.1224
 mod_version=2.1.0
diff --git a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java
index c29c99b4f..af94d102d 100644
--- a/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java
+++ b/src/main/java/biomesoplenty/common/world/layer/GenLayerBiomeBOP.java
@@ -1,9 +1,8 @@
 package biomesoplenty.common.world.layer;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import biomesoplenty.common.configuration.BOPConfigurationBiomeGen;
+import biomesoplenty.common.core.BOPBiomes;
+import biomesoplenty.common.world.BOPBiomeManager;
 import net.minecraft.util.WeightedRandom;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -12,9 +11,9 @@ import net.minecraft.world.gen.layer.GenLayerBiome;
 import net.minecraft.world.gen.layer.IntCache;
 import net.minecraftforge.common.BiomeManager;
 import net.minecraftforge.common.BiomeManager.BiomeEntry;
-import biomesoplenty.common.configuration.BOPConfigurationBiomeGen;
-import biomesoplenty.common.core.BOPBiomes;
-import biomesoplenty.common.world.BOPBiomeManager;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class GenLayerBiomeBOP extends GenLayerBiome
 {
@@ -31,11 +30,26 @@ public class GenLayerBiomeBOP extends GenLayerBiome
 		this.biomeLists[2].addAll(BOPBiomeManager.overworldBiomes[2]);
 		this.biomeLists[3].addAll(BOPBiomeManager.overworldBiomes[3]);
 		
-		this.biomeLists[0].addAll(BiomeManager.desertBiomes);
-		this.biomeLists[1].addAll(BiomeManager.warmBiomes);
-		this.biomeLists[2].addAll(BiomeManager.coolBiomes);
-		this.biomeLists[3].addAll(BiomeManager.icyBiomes);
-		
+		if (BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT) != null)
+		{
+            this.biomeLists[0].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.DESERT));
+        }
+
+        if (BiomeManager.getBiomes(BiomeManager.BiomeType.WARM) != null)
+        {
+            this.biomeLists[1].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.WARM));
+        }
+
+        if (BiomeManager.getBiomes(BiomeManager.BiomeType.COOL) != null)
+        {
+            this.biomeLists[2].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.COOL));
+        }
+
+        if (BiomeManager.getBiomes(BiomeManager.BiomeType.ICY) != null)
+        {
+            this.biomeLists[3].addAll(BiomeManager.getBiomes(BiomeManager.BiomeType.ICY));
+        }
+
         this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.desert, 30));
         this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.savanna, 20));
         this.biomeLists[0].add(new BiomeEntry(BiomeGenBase.plains, 10));