diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 2bc51bb11ba..fa78b451bdb 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -4915,7 +4915,11 @@ public class GameActionUtil {
 							AllZone.InputControl.setInput(new Input() {
 								private static final long serialVersionUID = 5313424586016061612L;
 								public void showMessage() {
-									if(list.size() == 0) stop();
+									if(list.size() == 0)
+                                    {
+                                        stop();
+                                        return;
+                                    }
 						             AllZone.Display.showMessage(source.getName()+" - Select "+num+" untapped artifact(s), creature(s), or land(s) you control");
 						             ButtonUtil.disableAll();
 						          }
@@ -4923,7 +4927,6 @@ public class GameActionUtil {
 						        	  if(zone.is(Constant.Zone.Battlefield, AllZone.HumanPlayer) && list.contains(card)) {
 						                card.tap();
 						                list.remove(card);
-                                        if(list.size() == 0) AllZone.InputControl.resetInput();
 						                stop();
 						             }
 						          }
diff --git a/src/forge/card/cardFactory/CardFactoryUtil.java b/src/forge/card/cardFactory/CardFactoryUtil.java
index 90ba888cd1b..d88c63c4667 100644
--- a/src/forge/card/cardFactory/CardFactoryUtil.java
+++ b/src/forge/card/cardFactory/CardFactoryUtil.java
@@ -751,7 +751,11 @@ public class CardFactoryUtil {
             @Override
             public void showMessage() {
             	//in case no more {type}s in play
-                if(n == nCards || list.size() == 0) stop();
+                if(n == nCards || list.size() == 0)
+                {
+                    stop();
+                    return;
+                }
             	
                 AllZone.Display.showMessage(message + " (" +(nCards-n) +" left)");
                 ButtonUtil.disableAll();
@@ -765,7 +769,11 @@ public class CardFactoryUtil {
                     list.remove(card);
                     
                     //in case no more {type}s in play
-                    if(n == nCards || list.size() == 0) stop();
+                    if(n == nCards || list.size() == 0)
+                    {
+                        stop();
+                        return;
+                    }
                     else
                     	showMessage();
                 }