diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java
index 719819955..ff2bf42fe 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java
@@ -13,7 +13,6 @@ import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod.RefExecutor;
 import com.intellectualcrafters.plot.util.SetQueue;
 import com.intellectualcrafters.plot.util.SetQueue.ChunkWrapper;
 import com.intellectualcrafters.plot.util.TaskManager;
-import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.SendChunk;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -261,17 +260,6 @@ public class FastQueue_1_8_3 extends SlowQueue {
         return new FastChunk_1_8_3(wrap);
     }
 
-    @Override
-    public void regenerateChunk(String worldname, ChunkLoc loc) {
-        World world = BukkitUtil.getWorld(worldname);
-        Chunk chunk = world.getChunkAt(loc.x, loc.z);
-        if (chunk.getTileEntities().length > 0) {
-            Object w = methodGetHandleWorld.of(world).call();
-            ((Collection) this.tileEntityListTick.of(w).get()).clear();
-        }
-        super.regenerateChunk(worldname, loc);
-    }
-
     /**
      * This should be overridden by any specialized queues
      * @param plotChunk
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
index c0d7b8f06..04b3eaa91 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
@@ -80,18 +80,6 @@ public class FastQueue_1_9 extends SlowQueue {
         MainUtil.initCache();
     }
 
-    @Override
-    public void regenerateChunk(String worldname, ChunkLoc loc) {
-        World world = BukkitUtil.getWorld(worldname);
-        Chunk chunk = world.getChunkAt(loc.x, loc.z);
-        if (chunk.getTileEntities().length > 0) {
-            Object c = methodGetHandleChunk.of(chunk).call();
-            Object w = methodGetWorld.of(c).call();
-            ((Collection) this.tileEntityListTick.of(w).get()).clear();
-        }
-        super.regenerateChunk(worldname, loc);
-    }
-
     /**
      * This should be overridden by any specialized queues
      * @param plotChunk
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PS.java b/Core/src/main/java/com/intellectualcrafters/plot/PS.java
index dccd9cf7d..26ef93e89 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -171,10 +171,16 @@ public class PS {
             if (Settings.KILL_ROAD_MOBS || Settings.KILL_ROAD_VEHICLES) {
                 this.IMP.runEntityTask();
             }
-            if (this.IMP.initWorldEdit()) {
-                this.worldedit = WorldEdit.getInstance();
-                WorldEdit.getInstance().getEventBus().register(new WESubscriber());
-                new WE_Anywhere();
+            try {
+                if (this.IMP.initWorldEdit()) {
+                    this.worldedit = WorldEdit.getInstance();
+                    WorldEdit.getInstance().getEventBus().register(new WESubscriber());
+                    new WE_Anywhere();
+
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+                PS.debug("Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
             }
 
             // Events