diff --git a/.gitattributes b/.gitattributes
index 153b1e0bbd6..b0db7fae93a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3462,6 +3462,7 @@ res/cardsfolder/g/guilty_conscience.txt svneol=native#text/plain
 res/cardsfolder/g/guma.txt svneol=native#text/plain
 res/cardsfolder/g/gush.txt svneol=native#text/plain
 res/cardsfolder/g/gust_skimmer.txt svneol=native#text/plain
+res/cardsfolder/g/gustcloak_harrier.txt -text
 res/cardsfolder/g/gustcloak_skirmisher.txt -text
 res/cardsfolder/g/gustrider_exuberant.txt svneol=native#text/plain
 res/cardsfolder/g/gut_shot.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/gustcloak_harrier.txt b/res/cardsfolder/g/gustcloak_harrier.txt
new file mode 100644
index 00000000000..59bac61fdc9
--- /dev/null
+++ b/res/cardsfolder/g/gustcloak_harrier.txt
@@ -0,0 +1,12 @@
+Name:Gustcloak Harrier
+ManaCost:1 W W
+Types:Creature Bird Soldier
+Text:no text
+PT:2/2
+K:Flying
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME becomes blocked, you may untap it and remove it from combat.
+SVar:TrigUntap:AB$ Untap | Cost$ 0 | Defined$ Self | SubAbility$ RemCombat
+SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Self
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_harrier.jpg
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
index d0e734ecb61..c9dc233aeb4 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Combat.java
@@ -568,7 +568,6 @@ public final class AbilityFactory_Combat {
 
     private static String removeFromCombatStackDescription(final AbilityFactory af, final SpellAbility sa) {
         HashMap<String, String> params = af.getMapParams();
-        Card host = af.getHostCard();
         StringBuilder sb = new StringBuilder();
 
         if (sa instanceof Ability_Sub) {