--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Wed Jun 09 09:26:39 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Mon Jun 21 15:24:39 2010 +0300
@@ -777,9 +777,11 @@
         // Check the Sync Status
         if( iIsHierarchicalSyncSupported )
             {
-            if( !iAgendaAdapterHandler->FolderSyncStatusL( aParent ) )
+            TBool syncstatus( EFalse );
+            TRAP( err, syncstatus = iAgendaAdapterHandler->FolderSyncStatusL( aParent ) );
+            if( err || !syncstatus  )
                 {
-                User::RequestComplete( iCallerStatus, KErrGeneral );
+                User::RequestComplete( iCallerStatus, err );
                 FLOG(_L("CNSmlAgendaDataStore::DoCreateItemL - Sync Disabled: END"));
                 return;
                 }
@@ -947,10 +949,11 @@
             FLOG(_L("CNSmlAgendaDataStore::DoReplaceItemL - Sync Disabled: END"));
             return;
             }         
-        
-        if( !iAgendaAdapterHandler->FolderSyncStatusL( parentid ) )
+        TBool syncstatus( EFalse );
+        TRAP( err, syncstatus = iAgendaAdapterHandler->FolderSyncStatusL( parentid ) );
+        if( err || !syncstatus  )
             {
-            User::RequestComplete( iCallerStatus, KErrGeneral );
+            User::RequestComplete( iCallerStatus, err );
             FLOG(_L("CNSmlAgendaDataStore::DoReplaceItemL - Sync Disabled: END"));
             return;
             }
@@ -1252,10 +1255,11 @@
             FLOG(_L("CNSmlAgendaDataStore::DoDeleteItemL - Sync Disabled: END"));
             return;
             }    
-        
-        if( !iAgendaAdapterHandler->FolderSyncStatusL( parentid ) )
+        TBool syncstatus( EFalse );
+        TRAP( err, syncstatus = iAgendaAdapterHandler->FolderSyncStatusL( parentid ) );
+        if( err || !syncstatus )
             {
-            User::RequestComplete( iCallerStatus, KErrGeneral );
+            User::RequestComplete( iCallerStatus, err );
             FLOG(_L("CNSmlAgendaDataStore::DoDeleteItemL - Sync Disabled: END"));
             return;
             }