diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 38b5ba65d735b2ba3e563fb0ed9f04d03bdd807b..21b7edcc167d3c7866330839b4a2578e31c02e35 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -147,9 +147,13 @@ try {
             $GLOBALS['DB_STUDIP_USER'],
             $GLOBALS['DB_STUDIP_PASSWORD']);
 } catch (PDOException $exception) {
-    header('HTTP/1.1 500 Internal Server Error');
-    die(sprintf('database connection %s failed', 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] .
-    ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE']));
+    if (Studip\ENV === 'development') {
+        throw $exception;
+    } else {
+        header('HTTP/1.1 500 Internal Server Error');
+        die(sprintf('database connection %s failed', 'mysql:host=' . $GLOBALS['DB_STUDIP_HOST'] .
+            ';dbname=' . $GLOBALS['DB_STUDIP_DATABASE']));
+    }
 }
 // set slave connection
 if (isset($GLOBALS['DB_STUDIP_SLAVE_HOST'])) {