--- a/idlefw/plugins/mcsplugin/publisher/src/mcspluginengine.cpp	Tue Apr 27 16:57:49 2010 +0300
+++ b/idlefw/plugins/mcsplugin/publisher/src/mcspluginengine.cpp	Tue May 11 16:30:05 2010 +0300
@@ -213,9 +213,12 @@
     StopObserving();
 
     delete iPluginData;
-    
+
+    // Notifier close has to be before iMenu close
+    iNotifier.Close();
     iMenu.Close();
     delete iWatcher;
+    delete iNotifyWatcher;
 
     CCoeEnv::Static()->DeleteResourceFile( iResourceOffset );
 
@@ -320,20 +323,21 @@
 //
 CMenuItem* CMCSPluginEngine::FetchMenuItemL( CMCSData& aData )
     {
+    CMenuItem* item = NULL;
     if( aData.MenuItem().Type() == KMenuTypeUrl )
         {
-        return CreateBkmItemL( aData );
+        item = CreateBkmItemL( aData );
         }
     else if( aData.MenuItem().Type() == KMenuTypeMailbox )
         {
-        return CreateMailboxItemL( aData);
+        item = CreateMailboxItemL( aData);
         }
     else
-        {
-        CMenuItem* item = NULL;
-        TRAP_IGNORE( item = CMenuItem::OpenL( iMenu, aData.MenuItem().Id() ) );
-        return item;
+        {        
+        item = CMenuItem::OpenL( iMenu, aData.MenuItem().Id() );
         }
+    
+    return item;
     }
 
 // ---------------------------------------------------------------------------