From 43da29da443080421fde46042f8c7228f62e293e Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 12 Oct 2013 22:57:44 +0200
Subject: [PATCH] Fixed two possible NPE.

---
 .../Mage.Player.Human/src/mage/player/human/HumanPlayer.java  | 4 ++--
 Mage/src/mage/game/combat/Combat.java                         | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

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 d0cce684f92..6adfaaf85a7 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
@@ -716,8 +716,8 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
         updateGameStatePriority("getAmount", game);
         game.fireGetAmountEvent(playerId, message, min, max);
         waitForIntegerResponse(game);
-        if (response != null) {
-            return response.getInteger();
+        if (response != null && response.getInteger() != null) {
+            return response.getInteger().intValue();
         } else {
             return 0;
         }
diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java
index 3d0382c0ff3..36384c964c4 100644
--- a/Mage/src/mage/game/combat/Combat.java
+++ b/Mage/src/mage/game/combat/Combat.java
@@ -559,6 +559,9 @@ public class Combat implements Serializable, Copyable<Combat> {
         for (Map.Entry<UUID, Set<UUID>> entry :creaturesForcedToBlockAttackers.entrySet()) {
             boolean blockIsValid;
             Permanent creatureForcedToBlock = game.getPermanent(entry.getKey());
+            if (creatureForcedToBlock == null) {
+                break;
+            }
             // creature does not block -> not allowed
             if (creatureForcedToBlock.getBlocking() == 0) {
                 blockIsValid = false;