--- a/mediasettings/mediasettingsapp/src/MPSettingsMainView.cpp	Fri Feb 19 22:52:52 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsMainView.cpp	Fri Mar 12 15:43:00 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 7 %
+// Version : %version: 8 %
 
 
 
@@ -107,14 +107,14 @@
             HandleListBoxSelectionL();
             break;
         case EAknSoftkeyBack:
-            if (iGsPlugin)
-            {
+            if ( iGsPlugin )
+                {
                 AppUi()->ActivateLocalViewL( KGSVideoPluginUid );       
-            }
+                }
             else
-            {
+                {
                 AppUi()->HandleCommandL(EEikCmdExit);
-            }
+                }
             break;
         default:
             AppUi()->HandleCommandL(aCommand);
@@ -210,7 +210,10 @@
         view->SetCurrentItem(KMPSettTopItemIndex);
         }
 
-    AppUi()->ActivateLocalViewL(iViewIds->At(iCurrentItem));
+    if ( iCurrentItem < count )
+        {
+        AppUi()->ActivateLocalViewL(iViewIds->At(iCurrentItem));
+        }
     }