--- a/installationservices/swi/source/sisregistry/server_legacy/sisregistryserversession.cpp	Wed Sep 01 12:22:02 2010 +0100
+++ b/installationservices/swi/source/sisregistry/server_legacy/sisregistryserversession.cpp	Tue Sep 14 21:31:28 2010 +0300
@@ -1758,7 +1758,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::LeaveIfError(err);
+				}            
 	        }
 	    else
 	        {