diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 28060cc8463..2ba2d849bd7 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -7697,11 +7697,12 @@ public class CardFactory implements NewConstants {
                 	for(int j=0;j<=num[0];j++) {
                 		choices[j] = ""+j;
                 	}
-                    String answer = (String)(AllZone.Display.getChoice(
+                    String answer = (String)(AllZone.Display.getChoiceOptional(
                             "Charge counters to remove", choices));
-                    
-                    num[0] = Integer.parseInt(answer);
-                    AllZone.Stack.add(addMana);
+                    if(null != answer && !answer.equals("")) {
+                    	num[0] = Integer.parseInt(answer);
+                        AllZone.Stack.add(addMana);
+                    }
                     stop();
                 }
             };