diff --git a/src/main/java/biomesoplenty/api/enums/BOPClimates.java b/src/main/java/biomesoplenty/api/enums/BOPClimates.java
index 0b1891958..adbd71c6f 100644
--- a/src/main/java/biomesoplenty/api/enums/BOPClimates.java
+++ b/src/main/java/biomesoplenty/api/enums/BOPClimates.java
@@ -116,12 +116,17 @@ public enum BOPClimates
 
     public ImmutableList<WeightedBiomeEntry> getLandBiomes()
     {
-        return ImmutableList.copyOf(this.landBiomes);
+        return this.landBiomes.isEmpty() ? ImmutableList.of(this.getDefaultWeightedBiomeEntry()) : ImmutableList.copyOf(this.landBiomes);
     }
 
     public ImmutableList<WeightedBiomeEntry> getIslandBiomes()
     {
-        return ImmutableList.copyOf(this.islandBiomes);
+        return this.islandBiomes.isEmpty() ? ImmutableList.of(this.getDefaultWeightedBiomeEntry()) : ImmutableList.copyOf(this.islandBiomes);
+    }
+
+    private WeightedBiomeEntry getDefaultWeightedBiomeEntry()
+    {
+        return new WeightedBiomeEntry(100, Biomes.OCEAN);
     }
 
     static
diff --git a/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java b/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java
index 906ec9025..fb985fa12 100644
--- a/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java
+++ b/src/main/java/biomesoplenty/common/biome/BiomeRegistry.java
@@ -16,6 +16,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.reflect.TypeToken;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.BiomeManager;
@@ -65,8 +66,9 @@ public class BiomeRegistry
             // Ignore biomes which don't have any weights set by default
             if (!((BiomeBOP)regData.getBiome()).getWeightMap().isEmpty())
             {
-                defaultStandardBiomeWeights.put(registration.regData.getName(), registration.regData.getWeights());
-                regDataMap.put(registration.regData.getName(), registration.regData);
+                String biomeName = new ResourceLocation(BiomesOPlenty.MOD_ID, regData.getName()).toString();
+                defaultStandardBiomeWeights.put(biomeName, registration.regData.getWeights());
+                regDataMap.put(biomeName, registration.regData);
             }
         }