--- a/installationservices/swi/source/sisregistry/server_legacy/sisregistrycache.cpp	Thu Jul 15 18:47:04 2010 +0300
+++ b/installationservices/swi/source/sisregistry/server_legacy/sisregistrycache.cpp	Thu Aug 19 10:02:49 2010 +0300
@@ -82,20 +82,23 @@
 	// General note: trap the error because this is not a leaving function
 	// and generating an error will not help 
 
-	// store the backup file out 
- 	TRAP(res, StoreBackupL());
- 	if (res != KErrNone)
- 		{
- 	DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to store backup (failure code: %d.)"), res);
- 		}
+	if (iIntegrityService)
+	    {
+	    // store the backup file out 
+	    TRAP(res, StoreBackupL());
+	    if (res != KErrNone)
+	        {
+	        DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to store backup (failure code: %d.)"), res);
+	        }
 
-	// integrity service operation committing point 
-	TRAP(res, iIntegrityService->CommitL());
-	if (res != KErrNone)
- 		{
-	DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to commit integrity services changes (failure code %d.)"), res);
- 		}
-
+	    // integrity service operation committing point 
+	    TRAP(res, iIntegrityService->CommitL());
+	    if (res != KErrNone)
+	        {
+	        DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to commit integrity services changes (failure code %d.)"), res);
+	        }
+	    }
+	
 	delete iBackupFile;
 	
 	delete iIntegrityService;
@@ -446,7 +449,7 @@
 			User::Leave(KErrCorrupt);	
 			}
 			
-		iTokens.Append(token);
+		iTokens.AppendL(token);
 		CleanupStack::Pop(token);
 		CleanupStack::PopAndDestroy(&fileStream);
 				
@@ -1417,7 +1420,7 @@
 	CleanupClosePushL(aDriveList);
 	aDriveList.Reset();
 	// a copy of the controller is always kept on drive C
-	aDriveList.Append(iSystemDrive);
+	aDriveList.AppendL(iSystemDrive);
 	
 	// only controllers will be written to removable media and 
 	// we have now to check for those