--- a/installationservices/swi/source/sisregistry/server/sisregistryserversession.cpp	Fri Aug 06 10:59:22 2010 +0300
+++ b/installationservices/swi/source/sisregistry/server/sisregistryserversession.cpp	Fri Aug 20 11:39:56 2010 +0300
@@ -1133,7 +1133,7 @@
         if (a[0] == '!')
             {
             TChar driveChar;
-            iFs.DriveToChar(EDriveZ, driveChar);
+            User::LeaveIfError(iFs.DriveToChar(EDriveZ, driveChar));
             a[0] = driveChar;
             }
 
@@ -1216,7 +1216,7 @@
                         if (a[0] == '!')
                             {
                             TChar driveChar;
-                            iFs.DriveToChar(EDriveZ, driveChar);
+                            User::LeaveIfError(iFs.DriveToChar(EDriveZ, driveChar));
                             a[0] = driveChar;
                             }                        
                        
@@ -1328,7 +1328,11 @@
 	        {
 	        // First boot detected. Add the first boot marker file as well as the format marker on the drive.
 	        SisRegistryUtil::CreateFileWithAttributesL(iFs, firstBootMarkerFilePath);
-	        SisRegistryUtil::CreateFileWithAttributesL(iFs, formatMarkerPath, fileAttributes);
+	        TRAPD(err,SisRegistryUtil::CreateFileWithAttributesL(iFs, formatMarkerPath, fileAttributes);)
+			if (err != KErrNone && err != KErrAlreadyExists)
+				{
+				User::Leave(err);
+				}   
 	        }
 	    else
 	        {