Make sure that we catch exceptions that may occur during the setup.

SVN:code[96]

trunk/setup/index.php

@@ -484,8 +484,10 @@ catch(Exception $e)
 	// We'll end here when the tmp config file does not exist. It's normal
 	$oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */);
 }
-switch($sOperation)
+try
 {
+	switch($sOperation)
+	{
 		case 'step1':
 		$oP->log("Info - ========= Wizard step 1 ========");
 		DisplayStep1($oP);
@@ -531,6 +533,15 @@ switch($sOperation)
 		default:
 		$oP->error("Error: unsupported operation '$sOperation'");
 		
+	}
+}
+catch(Exception $e)
+{
+	$oP->error("Error: '".$e->getMessage()."'");	
+}
+catch(CoreException $e)
+{
+	$oP->error("Error: '".$e->getHtmlDesc()."'");	
 }
 $oP->output();
 ?>