--- a/omads/omadsappui/AspSyncUtil/src/AspSyncHandler.cpp	Mon Jun 21 15:24:39 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspSyncHandler.cpp	Thu Jul 15 18:23:06 2010 +0300
@@ -623,7 +623,7 @@
 	FLOG( _L("CAspSyncHandler::OnSyncMLSyncError START") );
 	
 	// just store error code - sync is terminated only in function OnSyncMLSessionEvent
-	if (aErrorLevel == ESmlFatalError)
+	if (aErrorLevel == ESmlFatalError || aErrorLevel == ESmlWarning)
 		{
 		iSyncError = aError;
 		}

--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Mon Jun 21 15:24:39 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Thu Jul 15 18:23:06 2010 +0300
@@ -620,6 +620,7 @@
                 if ( err )
                     {
                     FLOG(_L("CNSmlAgendaDataStore::DoOpenItemL:Parent Id is not Valid one"));
+                    CleanupStack::PopAndDestroy( ); // writeStream
                     User::RequestComplete( iCallerStatus, KErrNotFound );
                     return;
                     }
@@ -635,6 +636,7 @@
             if( err != KErrNone || NULL == calfilename )
                 {
                 FLOG(_L("CNSmlAgendaDataStore::DoOpenItemL:Invalid CalendarInfo"));
+                CleanupStack::PopAndDestroy( ); // writeStream
                 User::RequestComplete( iCallerStatus, KErrNotFound );
                 return;
                 }     
@@ -652,6 +654,7 @@
                 FLOG(_L("CNSmlAgendaDataStore::DoOpenItemL: entry is not valid"));
                 delete agendautil; 
                 delete calfilename;
+                CleanupStack::PopAndDestroy( ); // writeStream
                 User::RequestComplete( iCallerStatus, KErrNotFound );
                 return;
                 }