diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java
index a37b7723c64..0525c576331 100644
--- a/src/main/java/forge/control/FControl.java
+++ b/src/main/java/forge/control/FControl.java
@@ -367,7 +367,8 @@ public enum FControl {
         for(Player p: pp)
             p.concede();
         
-        boolean humanHasPriority = game.getPhaseHandler().getPriorityPlayer().getLobbyPlayer() == getLobby().getGuiPlayer(); 
+        Player priorityPlayer = game.getPhaseHandler().getPriorityPlayer();
+        boolean humanHasPriority = priorityPlayer == null || priorityPlayer.getLobbyPlayer() == getLobby().getGuiPlayer(); 
 
         if ( hasHuman && humanHasPriority ) 
             game.getAction().checkGameOverCondition();
diff --git a/src/main/java/forge/control/FControlGamePlayback.java b/src/main/java/forge/control/FControlGamePlayback.java
index 3b2c3f8b74b..081b7f176bb 100644
--- a/src/main/java/forge/control/FControlGamePlayback.java
+++ b/src/main/java/forge/control/FControlGamePlayback.java
@@ -21,7 +21,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
     @Subscribe
     public void receiveGameEvent(final GameEvent ev) { ev.visit(this); }
 
-    private int phasesDelay = 400;
+    private int phasesDelay = 200;
     private int combatDelay = 400;
     private int resolveDelay = 600;
     
@@ -67,23 +67,6 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
         return null;
     }
     
-    /* (non-Javadoc)
-     * @see forge.game.event.IGameEventVisitor.Base#visit(forge.game.event.GameEventGameStarted)
-     */
-    @Override
-    public Void visit(GameEventGameStarted event) {
-        boolean hasHuman = false;
-        for(Player p :  event.players) {
-            if ( p.getController().getLobbyPlayer() == fc.getLobby().getGuiPlayer() )
-                hasHuman = true;
-        }
-        
-    
-        // show input here to adjust speed if no human playing
-        
-        return null;
-    }
-
 
     @Override
     public Void visit(GameEventLandPlayed event) {