diff --git a/main.js b/main.js
index 8c4221f..bd3ccec 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@ var app = require('app');  // Module to control application life.
 var BrowserWindow = require('browser-window');  // Module to create native browser window.
 var Menu = require('menu');
 var isDev = process.env.NODE_ENV === 'development';
-var constants = require('./'+(isDev ? 'src': 'dist')+'/util').Const;
+var Util = require('./'+(isDev ? 'src': 'dist')+'/util');
 
 var mainWindow = null;
 
@@ -41,3 +41,7 @@ app.on('ready', function() {
   });
 
 });
+
+process.on('exit', function(code) {
+  Util.Logger.info('Exiting with code "%s"', code || 0);
+});
diff --git a/src/store/middlewares/logger.js b/src/store/middlewares/logger.js
index fdeaf81..29dfd29 100644
--- a/src/store/middlewares/logger.js
+++ b/src/store/middlewares/logger.js
@@ -8,7 +8,6 @@ module.exports = function loggerMiddleware(store) {
       next(action);
       if(action.error) {
         logger.error(action.type, action.error);
-        return app.quit(1);
       }
     };
   };
diff --git a/src/util/logger.js b/src/util/logger.js
index 0409507..abe430c 100644
--- a/src/util/logger.js
+++ b/src/util/logger.js
@@ -6,12 +6,18 @@ var logFile = process.env.PITAYA_LOG_FILE;
 
 logger.level = logLevel;
 
-logger.add(winston.transports.Console, { colorize: true });
+logger.add(winston.transports.Console, {
+  colorize: true,
+  handleExceptions: true,
+  humanReadableUnhandledException: true
+});
 
 if(logFile) {
   logger.add(winston.transports.File, {
     filename: logFile,
-    json: false
+    json: false,
+    handleExceptions: true,
+    humanReadableUnhandledException: true
   });
 }