diff --git a/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java b/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java
index 2b32ad30c4c..80434068a89 100644
--- a/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java
+++ b/src/main/java/forge/card/ability/effects/ControlPlayerEffect.java
@@ -39,7 +39,7 @@ public class ControlPlayerEffect extends SpellAbilityEffect {
                     pTarget.obeyNewMaster(activator.getLobbyPlayer().createControllerFor(pTarget));
                     
                     // on following cleanup release control
-                    game.getCleanup().addUntil(pTarget, new Command() {
+                    game.getCleanup().addAt(new Command() {
                         @Override
                         public void run() {
                             pTarget.releaseControl();
diff --git a/src/main/java/forge/gui/match/controllers/CDock.java b/src/main/java/forge/gui/match/controllers/CDock.java
index fffd2ade38a..f875f144510 100644
--- a/src/main/java/forge/gui/match/controllers/CDock.java
+++ b/src/main/java/forge/gui/match/controllers/CDock.java
@@ -83,8 +83,10 @@ public enum CDock implements ICDoc {
         
         final Player p = findAffectedPlayer();
         if( p == null ) return;
-        if( p.isMindSlaved() ) 
-            GuiDialog.message("You cannot make concede a player you temporary control");
+        if( p.isMindSlaved() ) {
+            GuiDialog.message("You cannot make concede a player you temporarily control");
+            return;
+        }
 
         game.getInputQueue().invokeGameAction(new Runnable() {
             @Override