From b1b8eb0ad82af6bec7fb360060a643ff7498c7eb Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 31 Aug 2012 15:22:17 +0000
Subject: [PATCH] - Fixed NPE in mustBlockAnAttacker.

---
 src/main/java/forge/game/phase/CombatUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index c06d2cdf08a..9a32ede075a 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -386,7 +386,7 @@ public class CombatUtil {
      */
     public static boolean mustBlockAnAttacker(final Card blocker, final Combat combat) {
 
-        if (blocker == null) {
+        if (blocker == null || combat == null) {
             return false;
         }