From d2304b1df88e270fdc6eaafcc51154ebe823a043 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Thu, 29 Sep 2011 23:13:49 +0000
Subject: [PATCH] - Fix for attempting to put counters on a token that no
 longer exists

---
 .../forge/card/abilityFactory/AbilityFactory_Counters.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
index 35158c2e15d..92f6800a4f5 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
@@ -590,7 +590,11 @@ public class AbilityFactory_Counters {
 
         for (Card tgtCard : tgtCards) {
             if (tgt == null || CardFactoryUtil.canTarget(card, tgtCard)) {
-                if (AllZone.getZoneOf(tgtCard).is(Constant.Zone.Battlefield)) {
+                PlayerZone zone = AllZone.getZoneOf(tgtCard);
+                if (zone == null){
+                    // Do nothing, token disappeared
+                }
+                else if (zone.is(Constant.Zone.Battlefield)) {
                     tgtCard.addCounter(Counters.valueOf(type), counterAmount);
                 }
                 else {