diff --git a/typo3/sysext/install/Classes/Command/SetupCommand.php b/typo3/sysext/install/Classes/Command/SetupCommand.php
index 12d38cc3add52dde47f1ba30ce4a1a78614737da..b4cdac4c24bfea2209c8e6a07038b3112e6f1d84 100644
--- a/typo3/sysext/install/Classes/Command/SetupCommand.php
+++ b/typo3/sysext/install/Classes/Command/SetupCommand.php
@@ -296,7 +296,14 @@ EOT
                 $dbname->setValidator($dbNameValidator);
                 $databaseConnection['database'] = $questionHelper->ask($input, $output, $dbname);
             } else {
-                $dbNameValidator($dbnameFromCli);
+                try {
+                    $dbNameValidator($dbnameFromCli);
+                } catch (\RuntimeException $e) {
+                    $this->writeError($output, $e->getMessage());
+
+                    return Command::FAILURE;
+                }
+
                 $databaseConnection['database'] = $dbnameFromCli;
             }