diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index 94c4a0a09..3fda7ebbe 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -51,7 +51,15 @@ SmartScript::SmartScript()
     meOrigGUID = 0;
     goOrigGUID = 0;
     mResumeActionList = true;
-    mLastInvoker = NULL;
+    mLastInvoker = 0;
+}
+
+SmartScript::~SmartScript()
+{
+    for (ObjectListMap::iterator itr = mTargetStorage->begin(); itr != mTargetStorage->end(); ++itr)
+        delete itr->second;
+
+    delete mTargetStorage;
 }
 
 void SmartScript::OnReset()
diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
index 0daa81cdc..34e1faf96 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
@@ -33,8 +33,8 @@
 class SmartScript
 {
     public:
-        ~SmartScript(){};
         SmartScript();
+        ~SmartScript();
 
         void OnInitialize(WorldObject* obj, AreaTriggerEntry const* at = NULL);
         void GetScript();