diff --git a/src/main/java/forge/Constant.java b/src/main/java/forge/Constant.java
index f4f1c19e2a6..52d53360882 100644
--- a/src/main/java/forge/Constant.java
+++ b/src/main/java/forge/Constant.java
@@ -91,6 +91,7 @@ public interface Constant {
         Stack;
         
         public static Zone smartValueOf(final String value) {
+            if (value == null)  { return null; }
             if ("All".equals(value)) { return null; }
             String valToCompate = value.trim();
             for (Zone v : Zone.values()) { if (v.name().compareToIgnoreCase(valToCompate) == 0) { return v; } }