--- a/persistentstorage/centralrepository/cenrepsrv/install.cpp	Fri May 14 13:32:10 2010 +0100
+++ b/persistentstorage/centralrepository/cenrepsrv/install.cpp	Thu Jul 01 17:02:22 2010 +0100
@@ -73,8 +73,11 @@
 CCentRepSWIWatcher::~CCentRepSWIWatcher()
 	{
 	Cancel();
-	iSWIKey.Cancel();
-	iSWIKey.Close();
+	if(iSWIKey.Handle() != KNullHandle)
+		{
+		iSWIKey.Cancel();
+		iSWIKey.Close();
+		}
 	iInstallEntryArray.ResetAndDestroy();
 	iCurrentInstallDirEntries.ResetAndDestroy();
 	}