From c2488307015df5f8bc8fa8d4cea457bbdcc96b38 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Wed, 12 Oct 2011 02:23:44 +0000
Subject: [PATCH] Didn't fix the NPE properly last time

---
 src/main/java/forge/card/spellability/Spell_Permanent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/card/spellability/Spell_Permanent.java b/src/main/java/forge/card/spellability/Spell_Permanent.java
index a26c6dee7be..e9fdf0a0219 100644
--- a/src/main/java/forge/card/spellability/Spell_Permanent.java
+++ b/src/main/java/forge/card/spellability/Spell_Permanent.java
@@ -282,11 +282,11 @@ public class Spell_Permanent extends Spell {
 
             // Maybe better considerations
             AbilityFactory af = new AbilityFactory();
-            String execute = card.getSVar(params.get("Execute"));
+            String execute = params.get("Execute");
             if (execute == null) {
                 continue;
             }
-            SpellAbility exSA = af.getAbility(execute, card);
+            SpellAbility exSA = af.getAbility(card.getSVar(execute), card);
 
             if (api != null && !af.getAPI().equals(api))
                 continue;