diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 74cd5e2a7..ac3a791b0 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -1371,6 +1371,7 @@ public:
     {
         if(!starfound.empty())
         {
+            SAFE_DELETE(multiplier);
             multiplier = NEW WParsedInt(starfound, NULL, (MTGCardInstance *)source);
         }
         for (int i = 0; i < multiplier->getValue(); ++i)
@@ -1523,17 +1524,14 @@ public:
     ATokenCreator * clone() const
     {
         ATokenCreator * a = NEW ATokenCreator(*this);
+        a->multiplier = NEW WParsedInt(*(multiplier));
         a->isClone = 1;
         return a;
     }
 
     ~ATokenCreator()
     {
-        if (!isClone)
-        {
-        if(multiplier != NULL)
-            delete (multiplier);
-        }
+        SAFE_DELETE(multiplier);
     }
 
 };
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index efa5f20ba..54330761c 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -685,15 +685,14 @@ const char * AADrawer::getMenuText()
 AADrawer * AADrawer::clone() const
 {
     AADrawer * a = NEW AADrawer(*this);
-    a->nbcards = NEW WParsedInt(*(a->nbcards));
+    a->nbcards = NEW WParsedInt(*(this->nbcards));
     a->isClone = 1;
     return a;
 }
 
 AADrawer::~AADrawer()
 {
-    if(!isClone)
-        SAFE_DELETE(nbcards);
+    SAFE_DELETE(nbcards);
 }
 
 // AAFrozen: Prevent a card from untapping during next untap phase
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 70930adad..4e869a61f 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -367,6 +367,8 @@ MTGCardInstance * MTGPlayerCards::putInBattlefield(MTGCardInstance * card)
     return copy;
 }
 
+// Moves a card from one zone to another
+// If the card is not actually in the expected "from" zone, does nothing and returns null 
 MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to)
 {
     MTGCardInstance * copy = NULL;
@@ -382,58 +384,58 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
         doCopy = 0;
     }
 
-    if ((copy = from->removeCard(card, doCopy)))
+    if (!(copy = from->removeCard(card, doCopy)))
+        return NULL; //ERROR
+
+    if (options[Options::SFXVOLUME].number > 0)
     {
-        if (options[Options::SFXVOLUME].number > 0)
+        if (to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard)
         {
-            if (to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard)
+            if (card->isCreature())
             {
-                if (card->isCreature())
-                {
-                    JSample * sample = WResourceManager::Instance()->RetrieveSample("graveyard.wav");
-                    if (sample)
-                        JSoundSystem::GetInstance()->PlaySample(sample);
-                }
+                JSample * sample = WResourceManager::Instance()->RetrieveSample("graveyard.wav");
+                if (sample)
+                    JSoundSystem::GetInstance()->PlaySample(sample);
             }
         }
-
-        MTGCardInstance * ret = copy;
-
-        to->addCard(copy);
-
-        //The "Temp" zone are purely for code purposes, and we don't want the abilities engine to
-        //Trigger when cards move in this zone
-        // Additionally, when they mve "from" this zone,
-        // we trick the engine into believing that they moved from the zone the card was previously in
-        // See http://code.google.com/p/wagic/issues/detail?id=335
-        {
-            if (to == g->players[0]->game->temp || to == g->players[1]->game->temp)
-            {
-                //don't send event when moving to temp
-                return ret;
-            }
-
-            if (from == g->players[0]->game->temp || from == g->players[1]->game->temp)
-            {
-                //remove temporary stuff
-                MTGCardInstance * previous = copy->previous;
-                MTGCardInstance * previous2 = previous->previous;
-                from = previous->previousZone;
-                copy->previous = previous2;
-                if (previous2)
-                    previous2->next = copy;
-                previous->previous = NULL;
-                previous->next = NULL;
-                SAFE_DELETE(previous);
-            }
-        }
-
-        WEvent * e = NEW WEventZoneChange(copy, from, to);
-        g->receiveEvent(e);
-
-        return ret;
     }
-    return card; //Error
+
+    MTGCardInstance * ret = copy;
+
+    to->addCard(copy);
+
+    //The "Temp" zone are purely for code purposes, and we don't want the abilities engine to
+    //Trigger when cards move in this zone
+    // Additionally, when they mve "from" this zone,
+    // we trick the engine into believing that they moved from the zone the card was previously in
+    // See http://code.google.com/p/wagic/issues/detail?id=335
+    {
+        if (to == g->players[0]->game->temp || to == g->players[1]->game->temp)
+        {
+            //don't send event when moving to temp
+            return ret;
+        }
+
+        if (from == g->players[0]->game->temp || from == g->players[1]->game->temp)
+        {
+            //remove temporary stuff
+            MTGCardInstance * previous = copy->previous;
+            MTGCardInstance * previous2 = previous->previous;
+            from = previous->previousZone;
+            copy->previous = previous2;
+            if (previous2)
+                previous2->next = copy;
+            previous->previous = NULL;
+            previous->next = NULL;
+            SAFE_DELETE(previous);
+        }
+    }
+
+    WEvent * e = NEW WEventZoneChange(copy, from, to);
+    g->receiveEvent(e);
+
+    return ret;
+
 }
 
 void MTGPlayerCards::discardRandom(MTGGameZone * from, MTGCardInstance * source)
diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index d12fbda04..ad711df05 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -1375,6 +1375,11 @@ int MTGPersistRule::receiveEvent(WEvent * event)
                 if (e->to == p->game->graveyard)
                 {
                     MTGCardInstance * copy = p->game->putInZone(e->card, p->game->graveyard, e->card->owner->game->stack);
+                    if (!copy)
+                    {
+                        DebugTrace("MTGRULES: couldn't move card for persist");
+                        return 0;
+                    }
                     Spell * spell = NEW Spell(copy);
                     spell->resolve();
                     spell->source->counters->addCounter(-1, -1);