--- a/harvester/server/src/harvesterao.cpp	Tue Feb 02 00:24:33 2010 +0200
+++ b/harvester/server/src/harvesterao.cpp	Mon Feb 08 13:51:14 2010 +0000
@@ -187,6 +187,7 @@
     iContainerPHArray.ResetAndDestroy();
     iContainerPHArray.Close();
 	
+    delete iHarvesterOomAO;
     delete iRestoreWatcher;
 	delete iOnDemandAO;
 	delete iMdEHarvesterSession;

--- a/harvester/server/src/harvesteroomao.cpp	Tue Feb 02 00:24:33 2010 +0200
+++ b/harvester/server/src/harvesteroomao.cpp	Mon Feb 08 13:51:14 2010 +0000
@@ -49,6 +49,7 @@
 //
 CHarvesterOomAO::~CHarvesterOomAO()
 	{
+	Cancel();
 	iOomMsgQueue.Close();
 	}