diff --git a/src/main/java/forge/card/MagicColor.java b/src/main/java/forge/card/MagicColor.java
index 0fd9ea66a64..74c8f7f52a2 100644
--- a/src/main/java/forge/card/MagicColor.java
+++ b/src/main/java/forge/card/MagicColor.java
@@ -20,6 +20,7 @@ public class MagicColor {
     public static final byte[] WUBRG = new byte[] { WHITE, BLUE, BLACK, RED, GREEN }; 
     
     public static byte fromName(String s) {
+        if( s == null ) return 0;
         if (s.equalsIgnoreCase(Constant.Color.WHITE) || s.equalsIgnoreCase("w")) {
             return MagicColor.WHITE;
         }
diff --git a/src/main/java/forge/card/TriggerReplacementBase.java b/src/main/java/forge/card/TriggerReplacementBase.java
index 7c57b2a6087..4622b05adb0 100644
--- a/src/main/java/forge/card/TriggerReplacementBase.java
+++ b/src/main/java/forge/card/TriggerReplacementBase.java
@@ -301,7 +301,7 @@ public abstract class TriggerReplacementBase {
         }
 
         if (params.containsKey("ManaNotSpent")) {
-            byte spent = MagicColor.fromName(params.get("ManaSpent"));
+            byte spent = MagicColor.fromName(params.get("ManaNotSpent"));
             if ( 0 != (this.getHostCard().getColorsPaid() & spent)) {
                 return false;
             }