--- a/syncmlfw/ds/syncagent/src/nsmldscontent.cpp	Thu Aug 19 10:44:50 2010 +0300
+++ b/syncmlfw/ds/syncagent/src/nsmldscontent.cpp	Tue Aug 31 16:04:06 2010 +0300
@@ -120,7 +120,7 @@
 //
 TBool CNSmlDSContent::ContentIndexIsSet() const
 	{
-	if ( ( iIndex < 0 ) || ( iIndex >= iStores.Count() ) )
+	if ( iIndex == -1 )
 		{
 		return EFalse;
 		}
@@ -2476,13 +2476,7 @@
 	DBG_FILE(_S8("CNSmlDSContent::PackupRequestL begins"));
 	RMutex mutex;
 	if(mutex.OpenGlobal( KNSmlDSContentAtomicOperationName ) != KErrNone )
-	    {
-		TRAPD(err, mutex.CreateGlobal( KNSmlDSContentAtomicOperationName ));
-		if(err != KErrNone)
-		    {
-            return;
-		    }
-	    }
+		mutex.CreateGlobal( KNSmlDSContentAtomicOperationName );
 	mutex.Wait();
 	SaveMapInfoL( aAnchor );
 	mutex.Signal();