--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -100,6 +100,10 @@
     // Create custom item prototype
     m_helper.addItemPrototype(new CpDivertSelectionItem());
     
+    // Listen form item visibility change
+    m_helper.connectToForm(
+            SIGNAL(itemShown(QModelIndex)), this, SLOT(itemShown(QModelIndex)));
+    
     // Create grouped setting items
     createVoiceCallItems();
     createVideoCallItems();
@@ -617,7 +621,9 @@
     DPRINT << ": IN : aReason:" << aReason;
     
     // Update view item for failed request
-    revertItemData(m_divertRequestQueue.head().item->condition());
+    if (m_divertRequestQueue.count()) {
+        revertItemData(m_divertRequestQueue.head().item->condition());
+    }
     
     // Clear queue
     m_divertRequestQueue.clear();