diff --git a/console.php b/console.php
index dd2c1026e4..55bae7a6b3 100644
--- a/console.php
+++ b/console.php
@@ -8,29 +8,34 @@
 
 use Symfony\Component\Console\Application;
 
-require_once 'lib/base.php';
+try {
+	require_once 'lib/base.php';
 
-// Don't do anything if ownCloud has not been installed yet
-if (!OC_Config::getValue('installed', false)) {
-	echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
-	exit(0);
-}
-
-if (!OC::$CLI) {
-	echo "This script can be run from the command line only" . PHP_EOL;
-	exit(0);
-}
-
-// load all apps to get all api routes properly setup
-OC_App::loadApps();
-
-$defaults = new OC_Defaults;
-$application = new Application($defaults->getName(), \OC_Util::getVersionString());
-require_once 'core/register_command.php';
-foreach(OC_App::getAllApps() as $app) {
-	$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
-	if(file_exists($file)) {
-		require $file;
+	// Don't do anything if ownCloud has not been installed yet
+	if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+		echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
+		exit(0);
 	}
+
+	if (!OC::$CLI) {
+		echo "This script can be run from the command line only" . PHP_EOL;
+		exit(0);
+	}
+
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
+
+	$defaults = new OC_Defaults;
+	$application = new Application($defaults->getName(), \OC_Util::getVersionString());
+	require_once 'core/register_command.php';
+	foreach(OC_App::getAllApps() as $app) {
+		$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
+		if(file_exists($file)) {
+			require $file;
+		}
+	}
+	$application->run();
+} catch (Exception $ex) {
+	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo $ex;
 }
-$application->run();
diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index c5ef0c55cc..310c01fbe2 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -29,7 +29,7 @@ class Repair extends Command {
 	protected function configure() {
 		$this
 			->setName('maintenance:repair')
-			->setDescription('set single user mode');
+			->setDescription('repair this installation');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {