diff --git a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java
index dfb84eaaf..8316c249c 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WESubscriber.java
@@ -72,10 +72,13 @@ public class WESubscriber {
                         Player objPlayer = ((BukkitPlayer) player).player;
                         ItemStack item = objPlayer.getItemInHand();
                         if (item != null && !hasMask) {
-                            BrushTool tool = session.getBrushTool(item.getTypeId());
-                            if (tool != null) {
-                                hasMask = tool.getMask() != null;
+                            try {
+                                BrushTool tool = session.getBrushTool(item.getTypeId());
+                                if (tool != null) {
+                                    hasMask = tool.getMask() != null;
+                                }
                             }
+                            catch (Exception e) {}
                         }
                         AbstractDelegateExtent extent = (AbstractDelegateExtent) event.getExtent();
                         ChangeSetExtent history = null;
diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar
index 3358da330..bba74a540 100644
Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ
diff --git a/target/PlotSquared-Sponge.jar b/target/PlotSquared-Sponge.jar
index d700dae9b..e63ca81dc 100644
Binary files a/target/PlotSquared-Sponge.jar and b/target/PlotSquared-Sponge.jar differ