--- a/contextengine/src/contextengine.cpp	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/src/contextengine.cpp	Wed Aug 18 10:12:07 2010 +0300
@@ -109,6 +109,7 @@
             {
             // destroy the singleton and free TLS
             delete data;
+            data = NULL;
             UserSvr::DllFreeTls( KContextEngineTLSKey );
             }
         }
@@ -132,6 +133,7 @@
         {
         // destroy the singleton and free TLS
         delete data;
+        data = NULL;
         UserSvr::DllFreeTls( KContextEngineTLSKey );
         }
     }
@@ -144,6 +146,7 @@
     {
     WRITELOG( "CContextEngine::~CContextEngine" ); // DEBUG INFO
     delete iContextEngineAO;
+    iContextEngineAO = NULL;
 
     MdsUtils::CleanupPtrArray<CContextSnapshotItem>( &iSnapshotQueue );
     REComSession::FinalClose(); // we are done
@@ -279,6 +282,7 @@
     if ( iSnapshotQueue.Append( aItem ) != KErrNone )
         {
         delete aItem;
+        aItem = NULL;
         return;
         }