--- a/watchdog/src/watchdog.cpp	Wed Jul 14 07:57:22 2010 +0300
+++ b/watchdog/src/watchdog.cpp	Fri Jul 23 10:03:59 2010 +0300
@@ -161,8 +161,10 @@
 //
 CWatchdog::~CWatchdog()
     {
-    delete iShutdownObserver;    
+    delete iShutdownObserver;
+    iShutdownObserver = NULL;
     delete iSelfShutdownObserver;
+    iSelfShutdownObserver = NULL;
     Cancel();
     }
 
@@ -304,5 +306,6 @@
         }
   
     delete cleanupStack;
+    cleanupStack = NULL;
     return err;
     }