--- a/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp	Tue Feb 02 00:44:00 2010 +0200
+++ b/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp	Fri Apr 16 15:52:47 2010 +0300
@@ -635,7 +635,7 @@
         {
         // The configuration has already been checked, exit
         Dprint( (_L("CSCPServer::ValidateConfigurationL(): Configuration is non-default.") ));
-        User::Leave( KErrNone );
+        return;
         }
     else if ( aMode == KSCPInitial )
         {