--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -34,7 +34,7 @@
 #include <SmlDataFormat.h>
 #include <SmlDataSyncDefs.h>
 #include <data_caging_path_literals.hrh>
-#include <NSmlAgendaDataStore_1_1_2.rsg>
+#include <nsmlagendadatastore_1_1_2.rsg>
 #include <e32property.h>
 #include <DataSyncInternalPSKeys.h>
 #include <CalenImporter.h>
@@ -656,7 +656,15 @@
             iItemData->Compress();
             iPos = 0;
      
-            iDataMod->StripTxL( *iItemData );
+            TRAPD(error,iDataMod->StripTxL( *iItemData ));
+            if (error)
+                {
+                delete agendautil;
+                delete calfilename;
+                CleanupStack::PopAndDestroy( ); // writeStream
+                User::RequestComplete( iCallerStatus, error);
+                return;
+                }
             delete agendautil;
             delete calfilename;
             }