--- a/emailservices/nmregister/src/nmmailboxregisterinterfaceplugin.cpp	Mon May 24 21:02:02 2010 +0300
+++ b/emailservices/nmregister/src/nmmailboxregisterinterfaceplugin.cpp	Fri May 28 13:56:43 2010 +0300
@@ -15,6 +15,8 @@
 *
 */
 
+#include "emailtrace.h"
+
 #include <qserviceinterfacedescriptor.h>
 #include <qabstractsecuritysession.h>
 #include <qservicecontext.h>
@@ -30,17 +32,23 @@
                                                 QServiceContext *context,
                                                 QAbstractSecuritySession *session)
 {
+    NM_FUNCTION;
+    
     Q_UNUSED(context);
     Q_UNUSED(session);
-
+    
     if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IEmailRegisterAccount")) {
-        return new NmMailboxRegisterInterface(this);
+        QT_TRY{
+            return new NmMailboxRegisterInterface(this);
+        }QT_CATCH(...){
+            return 0;
+        }
     } else {
         return 0;
     }
 }
 
-Q_EXPORT_PLUGIN2(hsmenucontentpublishplugin, NmMailboxRegisterInterfacePlugin)
+Q_EXPORT_PLUGIN2(nmregister, NmMailboxRegisterInterfacePlugin)
 
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC ENDSKIP