Index: src/game/Player.cpp
===================================================================
--- src/game/Player.cpp	(revision 2876)
+++ src/game/Player.cpp	(working copy)
@@ -2079,7 +2079,7 @@
     PlayerSpellMap::iterator itr = m_spells.find(spell_id);
     if (itr != m_spells.end())
     {
-        if(itr->second->state == PLAYERSPELL_REMOVED) return false;
+        if(itr->second->state == PLAYERSPELL_REMOVED) return itr;
 
         WorldPacket data;
         data.Initialize(SMSG_REMOVED_SPELL);
@@ -2089,7 +2089,7 @@
         if(itr->second->state == PLAYERSPELL_NEW)
         {
             delete itr->second;
-            itr = m_spells.erase(itr);
+            m_spells.erase(itr);
         }
         else
         {