diff --git a/.eslintrc.json b/.eslintrc.json
index 37a851ea9..81c869699 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -246,7 +246,7 @@
         "sort-imports": 0,
         "sort-keys": 0,
         "space-before-blocks": [2, "always"],
-        "space-before-function-paren": [2, "never"],
+        "space-before-function-paren": [2, {"anonymous": "never", "named": "never", "asyncArrow": "always"}],
         "space-in-parens": [2, "never"],
         "space-infix-ops": 2,
         "space-unary-ops": [2, { "words": true, "nonwords": false }],
diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js
index 9099dd224..00a107909 100644
--- a/app/actions/views/channel.js
+++ b/app/actions/views/channel.js
@@ -258,7 +258,7 @@ export function toggleGMChannel(channelId, visible) {
 }
 
 export function closeDMChannel(channel) {
-    return async(dispatch, getState) => {
+    return async (dispatch, getState) => {
         const state = getState();
 
         if (channel.isFavorite) {
@@ -273,7 +273,7 @@ export function closeDMChannel(channel) {
 }
 
 export function closeGMChannel(channel) {
-    return async(dispatch, getState) => {
+    return async (dispatch, getState) => {
         const state = getState();
 
         if (channel.isFavorite) {
diff --git a/app/mattermost.js b/app/mattermost.js
index d2765d846..602e0956d 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -45,7 +45,7 @@ registerScreens(store, Provider);
 export default class Mattermost {
     constructor() {
         this.isConfigured = false;
-        setJSExceptionHandler(this.errorHandler, true);
+        setJSExceptionHandler(this.errorHandler, false);
         Orientation.lockToPortrait();
         this.unsubscribeFromStore = store.subscribe(this.listenForHydration);
         AppState.addEventListener('change', this.handleAppStateChange);