diff --git a/src/game/World.cpp b/src/game/World.cpp
index 8ee55172b..2c2e87a3d 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -125,6 +125,9 @@ World::~World()
 
     m_weathers.clear();
 
+    while (!cliCmdQueue.empty())
+        delete cliCmdQueue.next();
+
     VMAP::VMapFactory::clear();
 
     if(m_resultQueue) delete m_resultQueue;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6a19ed4cf..936d41044 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6885"
+ #define REVISION_NR "6886"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp
index 172aa9b25..5a5af7b45 100644
--- a/src/shared/vmap/VMapFactory.cpp
+++ b/src/shared/vmap/VMapFactory.cpp
@@ -97,8 +97,14 @@ namespace VMAP
     void VMapFactory::clear()
     {
         if(iIgnoreSpellIds)
+        {
             delete iIgnoreSpellIds;
+            iIgnoreSpellIds = NULL;
+        }
         if(gVMapManager)
+        {
             delete gVMapManager;
+            gVMapManager = NULL;
+        }
     }
 }