diff --git a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
index 2e7288a1..68e636dc 100644
--- a/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
+++ b/core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
@@ -368,7 +368,7 @@ public class BrushCommands extends BrushProcessor {
         InputStream stream = getHeightmapStream(image);
         HeightBrush brush;
         try {
-            brush = new StencilBrush(stream, rotation, yscale, onlyWhite, image.equalsIgnoreCase("#clipboard") ? session.getClipboard().getClipboard() : null);
+            brush = new StencilBrush(stream, rotation, yscale, onlyWhite, "#clipboard".equalsIgnoreCase(image) ? session.getClipboard().getClipboard() : null);
         } catch (EmptyClipboardException ignore) {
             brush = new StencilBrush(stream, rotation, yscale, onlyWhite, null);
         }
@@ -745,17 +745,17 @@ public class BrushCommands extends BrushProcessor {
 
     private BrushSettings terrainBrush(Player player, LocalSession session, Expression radius, String image, int rotation, double yscale, boolean flat, boolean randomRotate, boolean layers, boolean smooth, ScalableHeightMap.Shape shape, CommandContext context) throws WorldEditException, FileNotFoundException, ParameterException {
         checkMaxBrushRadius(radius);
-        InputStream stream = getHeightmapStream(image);
+        InputStream stream = image == null ? null : getHeightmapStream(image);
         HeightBrush brush;
         if (flat) {
             try {
-                brush = new FlattenBrush(stream, rotation, yscale, layers, smooth, image.equalsIgnoreCase("#clipboard") ? session.getClipboard().getClipboard() : null, shape);
+                brush = new FlattenBrush(stream, rotation, yscale, layers, smooth, "#clipboard".equalsIgnoreCase(image) ? session.getClipboard().getClipboard() : null, shape);
             } catch (EmptyClipboardException ignore) {
                 brush = new FlattenBrush(stream, rotation, yscale, layers, smooth, null, shape);
             }
         } else {
             try {
-                brush = new HeightBrush(stream, rotation, yscale, layers, smooth, image.equalsIgnoreCase("#clipboard") ? session.getClipboard().getClipboard() : null);
+                brush = new HeightBrush(stream, rotation, yscale, layers, smooth, "#clipboard".equalsIgnoreCase(image) ? session.getClipboard().getClipboard() : null);
             } catch (EmptyClipboardException ignore) {
                 brush = new HeightBrush(stream, rotation, yscale, layers, smooth, null);
             }
@@ -769,6 +769,7 @@ public class BrushCommands extends BrushProcessor {
     }
 
     private InputStream getHeightmapStream(String filename) throws FileNotFoundException, ParameterException {
+        if (filename == null) return null;
         String filenamePng = (filename.endsWith(".png") ? filename : filename + ".png");
         File file = new File(Fawe.imp().getDirectory(), Settings.IMP.PATHS.HEIGHTMAP + File.separator + filenamePng);
         if (file.exists()) return new FileInputStream(file);