--- a/metadataengine/server/src/mdssqlobjectmanipulate.cpp	Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/server/src/mdssqlobjectmanipulate.cpp	Fri Sep 17 16:54:49 2010 +0300
@@ -71,6 +71,7 @@
 CMdSIdentifierGenerator::~CMdSIdentifierGenerator()
     {
     delete iDigest;
+    iDigest = NULL;
     }
 
 void CMdSIdentifierGenerator::ConstructL( )
@@ -178,11 +179,14 @@
 	for (TInt i = 0; i < count; ++i)
 		{
 		delete iBuffers[i].iBuffer;
+		iBuffers[i].iBuffer = NULL;
 		}
 	iBuffers.Close();
 
 	delete iGenerator;
+	iGenerator = NULL;
 	delete iUri;
+	iUri = NULL;
     }
 
 CMdSSqlObjectManipulate::CMdSSqlObjectManipulate( const CMdsSchema& aSchema, 
@@ -2267,8 +2271,8 @@
 		TPtrC16 uri = aBuffer.ReceivePtr16L();
         objectId = SearchObjectByUriL( uri, flags );
         if ( objectId != KNoId && 
-             objectId != KSystemFavouritesAlbumId && 
-             objectId != KSystemCapturedAlbumId )
+             uri != KSystemFavouritesAlbumUri && 
+             uri != KSystemCapturedAlbumUri )
 			{
 			// unlock object, so update is no possible anymore
 			if ( iLockList.IsLocked( *iNamespaceDef, objectId ) )