From 13db59aac8d12cd65d285da7901ee46ec0b8b836 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 14 Dec 2013 20:56:21 +0000
Subject: [PATCH] - Fixed possible source for NPE's in RemoveFromCombatEffect.

---
 .../forge/game/ability/effects/RemoveFromCombatEffect.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java b/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
index 6a9f29f7a13..95934663c5b 100644
--- a/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
+++ b/forge-gui/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import forge.game.Game;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.combat.Combat;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
@@ -34,8 +35,9 @@ public class RemoveFromCombatEffect extends SpellAbilityEffect {
 
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         for (final Card c : getTargetCards(sa)) {
-            if ((tgt == null) || c.canBeTargetedBy(sa) && game.getPhaseHandler().inCombat()) {
-                game.getPhaseHandler().getCombat().removeFromCombat(c);
+        	final Combat combat = game.getPhaseHandler().getCombat();
+            if (combat != null && (tgt == null || c.canBeTargetedBy(sa))) {
+            	combat.removeFromCombat(c);
                 if (rem) {
                     sa.getSourceCard().addRemembered(c);
                 }