diff --git a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java
index 1d6cd3b0..b39e1fd5 100644
--- a/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java
+++ b/src/main/java/com/garbagemule/MobArena/region/ArenaRegion.java
@@ -524,8 +524,8 @@ private void setPoint(RegionPoint point, Location l) {
         }
 
         // Set the coords and save
-        if (lower != null) setLocation(coords, r1.name().toLowerCase(), lower);
-        if (upper != null) setLocation(coords, r2.name().toLowerCase(), upper);
+        if (lower != null && r1 != null) setLocation(coords, r1.name().toLowerCase(), lower);
+        if (upper != null && r2 != null) setLocation(coords, r2.name().toLowerCase(), upper);
         save();
 
         // Reload regions and verify data
diff --git a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
index a3dba27a..ce79c1b3 100644
--- a/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
+++ b/src/main/java/com/garbagemule/MobArena/waves/WaveParser.java
@@ -98,6 +98,8 @@ public static Wave parseWave(Arena arena, String name, ConfigurationSection conf
             case BOSS:
                 result = parseBossWave(arena, name, config);
                 break;
+            default:
+                throw new ConfigError("Unknown wave type for wave " + name + " of arena " + arena.configName() + ": " + t);
         }
 
         // Grab the branch-specific nodes.