diff --git a/.gitattributes b/.gitattributes
index 822169e280b..062f84c57f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -251,6 +251,7 @@ res/cardsfolder/a/an_havva_constable.txt svneol=native#text/plain
 res/cardsfolder/a/an_havva_inn.txt svneol=native#text/plain
 res/cardsfolder/a/an_havva_township.txt svneol=native#text/plain
 res/cardsfolder/a/an_zerrin_ruins.txt svneol=native#text/plain
+res/cardsfolder/a/ana_battlemage.txt -text
 res/cardsfolder/a/ana_disciple.txt svneol=native#text/plain
 res/cardsfolder/a/ana_sanctuary.txt -text
 res/cardsfolder/a/anaba_ancestor.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/ana_battlemage.txt b/res/cardsfolder/a/ana_battlemage.txt
new file mode 100644
index 00000000000..50487b37511
--- /dev/null
+++ b/res/cardsfolder/a/ana_battlemage.txt
@@ -0,0 +1,19 @@
+Name:Ana Battlemage
+ManaCost:2 G
+Types:Creature Human Wizard
+Text:no text
+PT:2/2
+K:Kicker 2 U
+K:Kicker 1 B
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 2 U | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked with its 2 U kicker, target player discards three cards.
+SVar:TrigKicker:DB$ Discard | Cost$ 0 | ValidTgts$ Player | NumCards$ 3 | Mode$ TgtChoose
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 1 B | Execute$ TrigKicker2 | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked with its 1 B kicker, tap target untapped creature and that creature deals damage equal to its power to its controller.
+SVar:TrigKicker2:DB$ Tap | Cost$ 0 | ValidTgts$ Creature.untapped | TgtPrompt$ Select target untapped creature | SubAbility$ DBDamage | SpellDescription$ Tap target untapped creature. That creature deals damage equal to its power to its controller.
+SVar:DBDamage:DB$ DealDamage | Cost$ 0 | Defined$ TargetedController | DamageSource$ Targeted | NumDmg$ X | References$ X
+SVar:X:Targeted$CardPower
+SVar:PlayMain1:TRUE
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ana_battlemage.jpg
+SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/124.jpg
+Oracle:Kicker {2}{U} and/or {1}{B} (You may pay an additional {2}{U} and/or {1}{B} as you cast this spell.)\nWhen Ana Battlemage enters the battlefield, if it was kicked with its {2}{U} kicker, target player discards three cards.\nWhen Ana Battlemage enters the battlefield, if it was kicked with its {1}{B} kicker, tap target untapped creature and that creature deals damage equal to its power to its controller.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index aa7ffc25034..0c99702ecaa 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -2346,11 +2346,11 @@ public class AbilityFactory {
         SpellAbility parent = sa;
 
         do {
-            if (!(parent instanceof AbilitySub)) {
+            if (!(parent instanceof AbilitySub) || ((AbilitySub) parent).getParent() == null) {
                 return parent;
             }
             parent = ((AbilitySub) parent).getParent();
-        } while ((parent.getTarget() == null) || (parent.getTarget().getTargetSAs().size() == 0));
+        } while (parent.getTarget() == null || parent.getTarget().getTargetSAs().size() == 0);
 
         return parent;
     }