diff -r cc88aabd867b -r 83c58605f049 userlibandfileserver/fileserver/sfile/sf_ext.cpp
--- a/userlibandfileserver/fileserver/sfile/sf_ext.cpp	Wed Jun 09 10:31:37 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_ext.cpp	Tue Jul 06 11:40:58 2010 +0100
@@ -188,7 +188,7 @@
 EXPORT_C CLocDrvMountCB::~CLocDrvMountCB()
 	{
 	__PRINT1(_L("CLocDrvMountCB::~CLocDrvMountCB() 0x%x"),this);
-	if(iProxyDrive && !LocalDrives::IsProxyDrive(Drive().DriveNumber()) && LocalDrives::IsValidDriveMapping(Drive().DriveNumber()))
+	if(iProxyDrive && !LocalDrives::IsProxyDrive(Drive().DriveNumber()))
 		delete(iProxyDrive);
 	}
 
@@ -281,7 +281,6 @@
 	{
 	__ASSERT_ALWAYS(iProxyDrive!=NULL,Fault(ELocDrvDismountedLocalDrive));
 	iProxyDrive->Dismounted();
-	iProxyDrive->SetMount(NULL);
 	}