diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java
index 145df1c19d7..439de510ca1 100644
--- a/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/src/main/java/forge/game/phase/PhaseHandler.java
@@ -714,6 +714,8 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
                 System.out.print(" >>\n");
             }
             
+            if ( game.isGameOver() ) return; // conceded?
+            
             // actingPlayer is the player who may act
             // the firstAction is the player who gained Priority First in this segment
             // of Priority
diff --git a/src/main/java/forge/game/player/PlayerController.java b/src/main/java/forge/game/player/PlayerController.java
index 469abca9a91..8fb47462ccb 100644
--- a/src/main/java/forge/game/player/PlayerController.java
+++ b/src/main/java/forge/game/player/PlayerController.java
@@ -54,9 +54,6 @@ public abstract class PlayerController {
         return phase.isBefore(autoPassUntil);
     }
 
-    public boolean isUiSetToSkipPhase(final Player turn, final PhaseType phase) {
-        return false; // human has it's overload
-    }
 
     // Triggers preliminary choice: ask, decline or play
     private Map<Integer, Boolean> triggersAlwaysAccept = new HashMap<Integer, Boolean>();
diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java
index e0998fc54ca..3fb6870675b 100644
--- a/src/main/java/forge/game/player/PlayerControllerHuman.java
+++ b/src/main/java/forge/game/player/PlayerControllerHuman.java
@@ -56,10 +56,10 @@ public class PlayerControllerHuman extends PlayerController {
     }
 
 
-    @Override
     public boolean isUiSetToSkipPhase(final Player turn, final PhaseType phase) {
         return !CMatchUI.SINGLETON_INSTANCE.stopAtPhase(turn, phase);
     }
+    
 
     /**
      * Uses GUI to learn which spell the player (human in our case) would like to play