diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java
index 8b0f2af43..286f63aee 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java
@@ -41,7 +41,9 @@ public class GenChunk extends PlotChunk<Chunk> {
 
     @Override
     public void setBiome(int x, int z, int biome) {
-        this.grid.setBiome(x, z, this.biomes[biome]);
+        if (this.grid != null) {
+            this.grid.setBiome(x, z, this.biomes[biome]);
+        }
     }
 
     public void setBiome(int x, int z, Biome biome) {
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
index 7a775fa45..cda7b404b 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
@@ -1301,7 +1301,7 @@ public class Plot {
         PlotArea plotworld = getArea();
         if (plotworld.SCHEMATIC_ON_CLAIM) {
             SchematicHandler.Schematic sch;
-            if (schematic.isEmpty()) {
+            if (schematic == null || schematic.isEmpty()) {
                 sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
             } else {
                 sch = SchematicHandler.manager.getSchematic(schematic);
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
index 31c70b0cd..d151634a2 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
@@ -705,7 +705,7 @@ public abstract class SchematicHandler {
          * @return Map of block location to tag
          */
         public HashMap<BlockLoc, CompoundTag> getTiles() {
-            return this.tiles;
+            return this.tiles == null ? new HashMap<BlockLoc, CompoundTag>() : tiles;
         }
 
         /**