--- a/contentstorage/casrv/casrvmgr/src/casrvmanager.cpp	Fri May 14 16:10:06 2010 +0300
+++ b/contentstorage/casrv/casrvmgr/src/casrvmanager.cpp	Thu May 27 13:11:12 2010 +0300
@@ -85,6 +85,15 @@
     }
 
 // ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CCaSrvManager::LoadOperationErrorCodeL()
+    {
+    return iErrorCode;
+    }
+
+// ---------------------------------------------------------------------------
 // CASpaPluginManager::LoadPluginsL
 // Load plugins implementations
 // ---------------------------------------------------------------------------
@@ -106,7 +115,12 @@
         {
         // Slice off first sub-section in the data section
         TUid current_plugin = infoArray[i]->ImplementationUid();
-        plug = CCaSrvPlugin::NewL( current_plugin, iPluginParams );
+        TRAPD(err, plug = CCaSrvPlugin::NewL( current_plugin, iPluginParams ));
+        if( KErrNone==iErrorCode )
+        	{
+        	// remember error code only if it wasn't set yet
+        	iErrorCode = err;
+        	}
         CleanupStack::PushL( plug );
         TInt32 key = current_plugin.iUid;
         iPluginMap.InsertL( key, plug );
@@ -116,4 +130,5 @@
     CleanupStack::PopAndDestroy( &infoArray );
     }
 
+
 // End of file