diff --git a/src/main/java/forge/card/ability/effects/CountersPutEffect.java b/src/main/java/forge/card/ability/effects/CountersPutEffect.java
index 68505cbc1b3..84e56620a03 100644
--- a/src/main/java/forge/card/ability/effects/CountersPutEffect.java
+++ b/src/main/java/forge/card/ability/effects/CountersPutEffect.java
@@ -107,9 +107,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
                     counterAmount = max - tgtCard.getCounters(counterType);
                 }
                 final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard);
-                if (zone == null) {
-                    // Do nothing, token disappeared
-                } else if (zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
+                if (zone == null || zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
                     if (remember) {
                         final int value = tgtCard.getTotalCountersToAdd(counterType, counterAmount, true);
                         tgtCard.addCountersAddedBy(card, counterType, value);
diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index ba11e04b498..ccdc36b1564 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -114,7 +114,7 @@ public class GameAction {
             }
             return c;
         }
-        if ((zoneFrom == null) && !c.isToken()) {
+        if (zoneFrom == null && !c.isToken()) {
             if (position == null) {
                 zoneTo.add(c);
             }
@@ -127,9 +127,7 @@ public class GameAction {
         }
 
         boolean suppress;
-        if ((zoneFrom == null) && !c.isToken()) {
-            suppress = true;
-        } else if (c.isToken()) {
+        if (c.isToken()) {
             suppress = false;
         } else {
             suppress = zoneFrom.equals(zoneTo);