diff --git a/lib/cli.js b/lib/cli.js
index a26a57bfa..d7de71135 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -119,3 +119,8 @@ function write_config_banner(def, config) {
 	console.log('===========================================================')
 }
 
+process.on('uncaughtException', function(err) {
+	logger.logger.fatal({err: err}, 'uncaught exception, please report this\n@{err.stack}')
+	process.exit(255)
+})
+