diff --git a/project/src/controllers/GameController.ts b/project/src/controllers/GameController.ts
index a3f9b9b4..e643fae0 100644
--- a/project/src/controllers/GameController.ts
+++ b/project/src/controllers/GameController.ts
@@ -279,6 +279,12 @@ export class GameController
 
             // Loop over all of the locations waves and look for waves with identical min and max slots
             const location: ILocationData = this.databaseServer.getTables().locations[locationKey];
+            if (!location.base)
+            {
+                this.logger.warning(`Map ${locationKey} lacks a base json, skipping map wave fixes`);
+                continue;
+            }
+
             for (const wave of location.base.waves)
             {
                 if ((wave.slots_max - wave.slots_min === 0))