diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
index 6e5217646..8fdb4138c 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
@@ -454,6 +454,9 @@ import com.intellectualcrafters.plot.object.PlotWorld;
     }
     
     public static void updateWorldBorder(Plot plot) {
+    	if (!worldBorder.containsKey(plot.world)) {
+    		return;
+    	}
     	String world = plot.world;
     	PlotManager manager = PlotMain.getPlotManager(world);
     	PlotWorld plotworld = PlotMain.getWorldSettings(world);