diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/util/image/BukkitImageListener.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/util/image/BukkitImageListener.java
index 6050ed91..d6d60387 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/util/image/BukkitImageListener.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/util/image/BukkitImageListener.java
@@ -151,12 +151,9 @@ public class BukkitImageListener implements Listener {
         try {
             tool = session.getBrushTool(fp.getPlayer(), false);
         } catch (InvalidToolBindException e) { return; }
-        if (tool == null) return;
-        BrushSettings context = primary ? tool.getPrimary() : tool.getSecondary();
-        Brush brush = context.getBrush();
 
         ItemFrame[][] frames = viewer.getItemFrames();
-        if (frames == null || brush == null) {
+        if (frames == null || tool == null) {
             viewer.selectFrame(itemFrame);
             TaskManager.IMP.laterAsync(new Runnable() {
                 @Override
@@ -167,6 +164,9 @@ public class BukkitImageListener implements Listener {
             return;
         }
 
+        if (tool == null) return;
+        BrushSettings context = primary ? tool.getPrimary() : tool.getSecondary();
+        Brush brush = context.getBrush();
         if (brush == null) return;
         tool.setContext(context);
 
diff --git a/core/src/main/java/com/boydti/fawe/config/Settings.java b/core/src/main/java/com/boydti/fawe/config/Settings.java
index 2114983d..5ccae763 100644
--- a/core/src/main/java/com/boydti/fawe/config/Settings.java
+++ b/core/src/main/java/com/boydti/fawe/config/Settings.java
@@ -310,10 +310,6 @@ public class Settings extends Config {
                 "Allows brushes to be persistent",
         })
         public boolean PERSISTENT_BRUSHES = false;
-        @Comment({
-                "Allow CFI visualization",
-        })
-        public boolean CFI_VISUALIZATION = false;
 
     }