diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index bdda0915ed7..5aa3ce60b98 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -151,11 +151,13 @@ public class HumanPlayer extends PlayerImpl {
 
     protected void waitResponseOpen() {
         // wait response open for answer process
-        while (!responseOpenedForAnswer && canRespond()) {
+        int numTimesWaiting = 0;
+        while (!responseOpenedForAnswer && canRespond() && numTimesWaiting < 300) {
+            numTimesWaiting ++;
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
-                logger.warn("Response waiting interrapted for " + getId());
+                logger.warn("Response waiting interrupted for " + getId());
             }
         }
     }
diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java
index 4b46792cbb1..98298e835ca 100644
--- a/Mage/src/main/java/mage/game/GameImpl.java
+++ b/Mage/src/main/java/mage/game/GameImpl.java
@@ -2452,6 +2452,9 @@ public abstract class GameImpl implements Game, Serializable {
 
     @Override
     public UUID getPriorityPlayerId() {
+        if (state.getPriorityPlayerId() == null) {
+            return state.getActivePlayerId();
+        }
         return state.getPriorityPlayerId();
     }