diff --git a/src/main/java/rtg/event/EventManagerRTG.java b/src/main/java/rtg/event/EventManagerRTG.java
index 403cda89f..ad79aba09 100644
--- a/src/main/java/rtg/event/EventManagerRTG.java
+++ b/src/main/java/rtg/event/EventManagerRTG.java
@@ -152,6 +152,7 @@ public void onBiomeGenInit(WorldTypeEvent.InitBiomeGens event) {
                 try {
                     event.newBiomeGens = new RiverRemover().riverLess(event.originalBiomeGens);
                 } catch (ClassCastException ex) {
+                    //throw ex;
                     // failed attempt because the GenLayers don't end with GenLayerRiverMix
                 }
             }
diff --git a/src/main/java/rtg/world/WorldTypeRTG.java b/src/main/java/rtg/world/WorldTypeRTG.java
index 4dcb2c7d2..c5aea3984 100644
--- a/src/main/java/rtg/world/WorldTypeRTG.java
+++ b/src/main/java/rtg/world/WorldTypeRTG.java
@@ -8,6 +8,7 @@
 import net.minecraft.world.biome.WorldChunkManager;
 import net.minecraft.world.chunk.IChunkProvider;
 
+import net.minecraft.world.gen.ChunkProviderGenerate;
 import net.minecraftforge.common.DimensionManager;
 
 public class WorldTypeRTG extends WorldType
@@ -34,7 +35,11 @@ public WorldChunkManager getChunkManager(World world)
     @Override
     public IChunkProvider getChunkGenerator(World world, String generatorOptions)
     {
-        return new ChunkProviderRTG(world, world.getSeed());
+        if (world.provider.dimensionId == 0) {
+            return new ChunkProviderRTG(world, world.getSeed());
+        } else {
+            return new ChunkProviderGenerate(world, world.getSeed(), world.getWorldInfo().isMapFeaturesEnabled());
+        }
     }
 	
     @Override