diff --git a/Mage.Sets/src/mage/sets/magicorigins/GideonBattleForged.java b/Mage.Sets/src/mage/sets/magicorigins/GideonBattleForged.java
index 729c7ca129d..67c718987ce 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/GideonBattleForged.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/GideonBattleForged.java
@@ -155,18 +155,25 @@ class GideonBattleForgedAttacksIfAbleTargetEffect extends RequirementEffect {
         }
         Permanent targetPermanent = targetPermanentReference.getPermanent(game);
         if (targetPermanent == null) {
-            return false;
+            return true;
         }
         if (nextTurnTargetController == 0 && startingTurn != game.getTurnNum() && game.getActivePlayerId().equals(targetPermanent.getControllerId())) {
             nextTurnTargetController = game.getTurnNum();
         }
-        return game.getPhase().getType() == TurnPhase.END && game.getTurnNum() > nextTurnTargetController;
+        if (game.getPhase().getType() == TurnPhase.END && nextTurnTargetController > 0 && game.getTurnNum() > nextTurnTargetController) {
+            return true;
+        }
+        return false;
     }
 
     @Override
     public void init(Ability source, Game game) {
-        targetPermanentReference = new MageObjectReference(getTargetPointer().getFirst(game, source), game);
         super.init(source, game);
+        if (getTargetPointer().getFirst(game, source) == null) {
+            discard();
+        } else {
+            targetPermanentReference = new MageObjectReference(getTargetPointer().getFirst(game, source), game);
+        }
     }
     
     @Override
@@ -175,9 +182,7 @@ class GideonBattleForgedAttacksIfAbleTargetEffect extends RequirementEffect {
             if (game.getActivePlayerId().equals(permanent.getControllerId())) {
                 Permanent planeswalker = game.getPermanent(source.getSourceId());
                 if (planeswalker != null) {
-                    if (planeswalker.getCardType().contains(CardType.CREATURE)) {
-                        return true;
-                    }
+                    return true;
                 } else {
                     discard();
                 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java
new file mode 100644
index 00000000000..ecd169b3272
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counter/AddingCountersToPermanentsTest.java
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.abilities.oneshot.counter;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class AddingCountersToPermanentsTest extends CardTestPlayerBase {
+
+    @Test
+    public void testBlackSunsZenith() {
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 4);
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Witch's Familiar", 1);
+
+        // Put X -1/-1 counters on each creature. Shuffle Black Sun's Zenith into its owner's library.
+        addCard(Zone.HAND, playerA, "Black Sun's Zenith", 1);
+        
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Witch's Familiar", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Black Sun's Zenith");
+        setChoice(playerA, "X=2");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Silvercoat Lion", 1);
+        assertGraveyardCount(playerB, "Silvercoat Lion", 1);
+        
+        assertPermanentCount(playerA, "Witch's Familiar", 1);        
+        assertPowerToughness(playerA, "Witch's Familiar", 0, 1);
+
+        assertPermanentCount(playerB, "Witch's Familiar", 1);        
+        assertPowerToughness(playerB, "Witch's Familiar", 0, 1);
+        
+
+    }
+
+}
\ No newline at end of file