--- a/metadataengine/server/src/mdsserversession.cpp	Mon Sep 27 15:53:05 2010 +0300
+++ b/metadataengine/server/src/mdsserversession.cpp	Wed Oct 06 15:08:08 2010 +0300
@@ -89,9 +89,12 @@
     iFindEngines.ResetAndDestroy();
     iFindEngines.Close();
 
-	iServer.LockList().UnlockBySession( *this );
-	iServer.Notifier().RemoveEntriesBySession( *this );
-    
+    if( !iServer.ShutdownInProgress() )
+        {
+        iServer.LockList().UnlockBySession( *this );
+        iServer.Notifier().RemoveEntriesBySession( *this );
+        }
+
     // purge any pending notifications
 	iNotificationCache.ResetAndDestroy();
     iNotificationCache.Close();