diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java
index ddccd7ae..7603a531 100644
--- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java
+++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java
@@ -240,8 +240,12 @@ public class BukkitWorld extends DynmapWorld {
         }
         return cnt;
     }
+    private Polygon lastBorder;
     @Override
     public Polygon getWorldBorder() {
-        return BukkitVersionHelper.helper.getWorldBorder(world);
+    	if (world != null) {
+    		lastBorder = BukkitVersionHelper.helper.getWorldBorder(world);
+    	}
+    	return lastBorder;
     }
 }