From 83a1b4f35edf63402a61a9330bfbeb3d521e6327 Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 17 Feb 2014 04:33:58 +0000 Subject: [PATCH] - Prevent NPE when the spell is countered. --- .../java/forge/game/ability/effects/ControlSpellEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java index 13470030d2e..230d6477ca7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java @@ -69,7 +69,7 @@ public class ControlSpellEffect extends SpellAbilityEffect { GameObject obj = Iterables.getFirst(getDefinedOrTargeted(sa, "DefinedExchange"), null); if (obj instanceof Card) { Card c = (Card)obj; - if (!(c.isInZone(ZoneType.Battlefield))) { + if (!(c.isInZone(ZoneType.Battlefield)) || si == null) { // Exchanging object isn't available, continue continue; }