diff --git a/.gitattributes b/.gitattributes
index 4d9329b4fc3..14c9b95f5a3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -222,6 +222,7 @@ res/cardsfolder/arid_mesa.txt -text svneol=native#text/plain
 res/cardsfolder/ark_of_blight.txt -text svneol=native#text/plain
 res/cardsfolder/armadillo_cloak.txt -text svneol=native#text/plain
 res/cardsfolder/armageddon.txt -text svneol=native#text/plain
+res/cardsfolder/armed_response.txt -text svneol=native#text/plain
 res/cardsfolder/armistice.txt -text svneol=native#text/plain
 res/cardsfolder/armored_cancrix.txt -text svneol=native#text/plain
 res/cardsfolder/armored_galleon.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/armed_response.txt b/res/cardsfolder/armed_response.txt
new file mode 100644
index 00000000000..f406a48d0de
--- /dev/null
+++ b/res/cardsfolder/armed_response.txt
@@ -0,0 +1,10 @@
+Name:Armed Response
+ManaCost:2 W
+Types:Instant
+Text:no text
+A:SP$DealDamage|Cost$2 W|ValidTgts$Creature.attacking|TgtPrompt$Select target Creature|NumDmg$X|SpellDescription$Armed Response deals damage to target attacking creature equal to the number of Equipment you control.
+SVar:X:Count$Valid Equipment.YouCtrl
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/armed_response.jpg
+End
\ No newline at end of file
diff --git a/src/forge/AbilityFactory_DealDamage.java b/src/forge/AbilityFactory_DealDamage.java
index c97340bef67..bb34054461a 100644
--- a/src/forge/AbilityFactory_DealDamage.java
+++ b/src/forge/AbilityFactory_DealDamage.java
@@ -21,8 +21,9 @@ public class AbilityFactory_DealDamage {
 		nDamage = NumDmg;
 		XDamage = NumDmgX;
 		
-		if (AF.getMapParams().get("Tgt").equals("TgtOpp"))
-			TgtOpp = true;
+		if(af.getMapParams().containsKey("Tgt"))
+			if (AF.getMapParams().get("Tgt").equals("TgtOpp"))
+				TgtOpp = true;
 		
         final SpellAbility abDamage = new Ability_Activated(AF.getHostCard(), AF.getAbCost(), AF.getAbTgt())
         {
@@ -58,8 +59,9 @@ public class AbilityFactory_DealDamage {
 		nDamage = NumDmg;
 		XDamage = NumDmgX;
 		
-		if (AF.getMapParams().get("Tgt").equals("TgtOpp"))
-			TgtOpp = true;
+		if(af.getMapParams().containsKey("Tgt"))
+			if (AF.getMapParams().get("Tgt").equals("TgtOpp"))
+				TgtOpp = true;
 		
 		final SpellAbility spDealDamage = new Spell(AF.getHostCard(), AF.getAbCost(), AF.getAbTgt()) {
             private static final long serialVersionUID = 7239608350643325111L;