diff --git a/src/common/error.js b/src/common/error.js
new file mode 100644
index 00000000..5ea68a9a
--- /dev/null
+++ b/src/common/error.js
@@ -0,0 +1,12 @@
+const { log } = require('./utils')
+
+process.on('uncaughtException', function(err) {
+  console.error('An uncaught error occurred!')
+  console.error(err)
+  log.error(err)
+})
+process.on('unhandledRejection', (reason, p) => {
+  console.error('Unhandled Rejection at: Promise ', p)
+  console.error(' reason: ', reason)
+  log.error(reason)
+})
diff --git a/src/main/index.js b/src/main/index.js
index c6320a2d..88cbfe03 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -15,6 +15,7 @@ app.on('second-instance', (event, argv, cwd) => {
   }
 })
 
+require('../common/error')
 require('./events')
 const autoUpdate = require('./utils/autoUpdate')
 const { isLinux, isMac } = require('../common/utils')
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 67630453..01337afb 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -11,6 +11,8 @@ import App from './App'
 import router from './route'
 import store from './store'
 
+import '../common/error'
+
 sync(store, router)
 
 if (!process.env.IS_WEB) {