--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagdaemon.cpp	Thu Jul 08 15:45:05 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagdaemon.cpp	Fri Jul 23 10:35:38 2010 +0300
@@ -194,7 +194,10 @@
     iAudioObserver = NULL;
     
     delete iMDSShutdownObserver;
+    iMDSShutdownObserver = NULL;
+    
     delete iShutdownObserver;
+    iShutdownObserver = NULL;
     
     if(iReconnect)
         {
@@ -267,6 +270,7 @@
        
         // comes here if server gets shut down
         delete server;
+        server = NULL;
         
         CleanupStack::PopAndDestroy( scheduler );
         }
@@ -538,6 +542,8 @@
     TInt ret = rep->Get( KEnableDaemon, val );
     
     delete rep;
+    rep = NULL;
+    
     TN_DEBUG3( "CThumbAGDaemon::DaemonEnabledL() - val == %d, ret == %d", val, ret );
     return val;
     }
@@ -579,6 +585,7 @@
         {
         TRAP( result, CThumbAGDaemon::ThreadFunctionL());
         delete cleanup;
+        cleanup = NULL;
         }
     
     if ( result != KErrNone )