--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Thu Aug 27 07:42:55 2009 +0300
@@ -802,12 +802,17 @@
             // if it doesn't, reset access point to always ask and homepage to blank access point home page.
   	        CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint );
 	        if (apItem == NULL)
-		        {
-                if( iVpnEngine->IsVpnApL( aDefaultAccessPoint ) )
+                {
+                TBool isVpn = EFalse; 
+                TRAPD(leaveCode, isVpn = iVpnEngine->IsVpnApL( aDefaultAccessPoint )) 
+                if ( leaveCode == KErrNone )
                 {
-                  BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) );
-                  break;
-                } 
+                    if ( isVpn ) 
+                        {
+                        BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) );
+                        break;               
+                        }    	    	
+                }
     	    	aDefaultAccessPoint = KWmlNoDefaultAccessPoint;
     	    	aAssocVpn = KWmlNoDefaultAccessPoint;
     	    	delete iAllPreferences.iDefaultAPDetails;