Merge remote-tracking branch 'origin/master' into gitlab_snippets

# Conflicts:
#	bower.json
#	public/views/body.ejs

1 files changed, 3 insertions, 0 deletions

diff --git a/app.js b/app.js
index 60eb61b5..5d847f76 100644
--- a/app.js
+++ b/app.js
@@ -516,5 +516,8 @@ models.sequelize.sync().then(startListen);
 
 // log uncaught exception
 process.on('uncaughtException', function (err) {
+    logger.error('An uncaught exception has occured.');
     logger.error(err);
+    logger.error('Process will exit now.');
+    process.exit(1);
 });
\ No newline at end of file