diff --git a/src/main/java/com/sk89q/worldedit/expression/runtime/Conditional.java b/src/main/java/com/sk89q/worldedit/expression/runtime/Conditional.java
index a6718fca7..3c1e52617 100644
--- a/src/main/java/com/sk89q/worldedit/expression/runtime/Conditional.java
+++ b/src/main/java/com/sk89q/worldedit/expression/runtime/Conditional.java
@@ -74,6 +74,6 @@ public class Conditional extends Node {
             }
         }
 
-        return new Conditional(getPosition(), newCondition, truePart.optimize(), falsePart.optimize());
+        return new Conditional(getPosition(), newCondition, truePart.optimize(), falsePart == null ? null : falsePart.optimize());
     }
 }