--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp	Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp	Wed Aug 18 09:48:26 2010 +0300
@@ -52,9 +52,14 @@
 InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler()
 {
     DPRINT;
-    // Disable MCN setting, 
-    // display client is being deleted 
-    disableMcn(); 
+    try {
+        // Disable MCN setting, 
+        // display client is being deleted
+        disableMcn(); 
+    } catch (const std::exception& ex) {
+        DCRITICAL << ": exception detected: " << ex.what();  
+    }      
+     
 }    
 
 /*!
@@ -65,14 +70,9 @@
     DPRINT;
     bool success(false);
     if (!m_nwSession) {
-        try {
-            QT_TRAP_THROWING(m_nwSession.reset(
-                    CreateL(*this, m_nwInfo)));
-        } catch (const std::exception& ex) {
-            DCRITICAL << ": exception " << ex.what(); 
-        }
-        
-        if (!m_nwSession.isNull()) {
+        QT_TRAP_THROWING(m_nwSession.reset(
+                CreateL(*this, m_nwInfo)));
+        if (m_nwSession) {
             DPRINT << ": session created"; 
             success = true;
         }
@@ -292,9 +292,7 @@
 }
 
 /*!
-    InfoWidgetNetworkHandler::writeMcnDisplayState()
-    
-    Handler for cenrep key writing   
+    Write Mcn cenrep key.   
 */
 void InfoWidgetNetworkHandler::writeMcnDisplayState(bool enabled)
 {
@@ -314,7 +312,7 @@
 }
 
 /*!
-    InfoWidgetNetworkHandler::readMcnDisplayState()
+    Read Mcn cenrep key.
 */
 bool InfoWidgetNetworkHandler::readMcnDisplayState()
 {