--- a/messagingfw/watcherfw/src/watcher.cpp	Thu Aug 19 10:24:00 2010 +0300
+++ b/messagingfw/watcherfw/src/watcher.cpp	Tue Aug 31 15:41:11 2010 +0300
@@ -43,6 +43,7 @@
 	// Launch the start-up manager that will launch the watchers in the 
  	// correct start-up state
 	CWatcherSSAStartupMgr* startupMgr = CWatcherSSAStartupMgr::NewL();
+	CleanupStack::PushL(startupMgr);
 
 	// The System Starter is waiting for us (start_method = EWaitForStart)
 	// so we rendez-vous so it can start the next process in the SSC
@@ -53,7 +54,7 @@
 	CActiveScheduler::Start();
 	
 	// Tidy up
-	CleanupStack::PopAndDestroy(scheduler);
+	CleanupStack::PopAndDestroy(2, scheduler);
 	}
 
 static TInt DoLaunchThread(TAny*)