--- a/harvester/common/src/harvestereventmanager.cpp	Wed Jul 14 07:57:22 2010 +0300
+++ b/harvester/common/src/harvestereventmanager.cpp	Fri Jul 23 10:03:59 2010 +0300
@@ -93,6 +93,7 @@
             {
             // destroy the singleton and free TLS
             delete data;
+            data = NULL;
             UserSvr::DllFreeTls( KHarvesterEventManagerTLSKey );
             }
         }
@@ -439,6 +440,7 @@
 				
 				iRegisteredObservers.Remove( i );
 				delete observer;
+				observer = NULL;
 				}
 			// Find if any other observer is using the same queue
 			else
@@ -468,6 +470,7 @@
                     iEventQueues.Remove( mid );
                     queue->Close();
                     delete queue;
+                    queue = NULL;
                     break;
 	                }
 	            else if( compare > 0 )