diff --git a/lib/database.js b/lib/database.js
index f2b2e366..c8b84852 100644
--- a/lib/database.js
+++ b/lib/database.js
@@ -24,10 +24,9 @@ module.exports.init = function () {
 
     // Test the connection
     pool.getConnection(function (err, conn) {
-        if(err) {
-            Logger.errlog.log("! DB connection failed");
-            Logger.errlog.log(err);
-            return;
+        if (err) {
+            Logger.errlog.log("Initial database connection failed: " + err.stack);
+            process.exit(1);
         } else {
             tables.init(module.exports.query, function (err) {
                 if (err) {