diff --git a/src/database/mongo.js b/src/database/mongo.js
index 0a5c5db6ef..3356f01cde 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -51,7 +51,7 @@
 			}
 		} catch (err) {
 			winston.error('Unable to initialize MongoDB! Is MongoDB installed? Error :' + err.message);
-			process.exit();
+			return callback(err);
 		}
 
 		var usernamePassword = '';
@@ -66,9 +66,9 @@
 			}
 		};
 		mongoClient.connect(connString, connOptions, function(err, _db) {
-			if(err) {
+			if (err) {
 				winston.error("NodeBB could not connect to your Mongo database. Mongo returned the following error: " + err.message);
-				process.exit();
+				return callback(err);
 			}
 
 			db = _db;