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 03c90866645..ad9961c87f7 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
@@ -152,8 +152,16 @@ public class HumanPlayer extends PlayerImpl {
     protected void waitResponseOpen() {
         // wait response open for answer process
         int numTimesWaiting = 0;
-        while (!responseOpenedForAnswer && canRespond() && numTimesWaiting < 300) {
+        while (!responseOpenedForAnswer && canRespond()) {
             numTimesWaiting ++;
+            if (numTimesWaiting >= 300) {
+                // game freezed -- need to report about error and continue to execute
+                String s = "Game freezed in waitResponseOpen for user " + getName();
+                Throwable th = new IllegalStateException(s);
+                logger.error(s, th);
+                break;
+            }
+
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
diff --git a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
index da7333acbd9..e16ff50b53b 100644
--- a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
+++ b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
@@ -96,7 +96,7 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
     public SwordOfWarAndPeaceAbility() {
         super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect());
         this.addEffect(new GainLifeEffect(new CardsInControllerHandCount()));
-        this.addTarget(new TargetPlayer());
+        this.addTarget(new TargetPlayer(1, 1, true));
     }
 
     public SwordOfWarAndPeaceAbility(final SwordOfWarAndPeaceAbility ability) {