diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
index a8feb6e03..3b352951a 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -205,11 +205,10 @@ public class TerraBukkitPlugin extends JavaPlugin {
     
     @Override
     public @Nullable
-    ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, @Nullable String id) {
+    ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
         return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
-            if(!terraPlugin.getConfigRegistry().contains(id)) throw new IllegalArgumentException("No such config pack \"" + id + "\"");
-            ConfigPack pack = terraPlugin.getConfigRegistry().get(id);
+            ConfigPack pack = terraPlugin.getConfigRegistry().get(id).orElseThrow(() -> new IllegalArgumentException("No such config pack \"" + id + "\""));
             return pack.getGeneratorProvider().newInstance(pack);
-        }), terraPlugin.getRawConfigRegistry().get(id));
+        }), terraPlugin.getRawConfigRegistry().get(id).orElseThrow());
     }
 }