diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index fa147f4ab..e8a59d935 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -2,7 +2,6 @@
 extends: "@elastic/eslint-config-kibana"
 
 rules:
-  no-empty: warn
   space-before-function-paren: warn
   no-restricted-globals: warn
   prefer-const: warn
\ No newline at end of file
diff --git a/grunt/config/s3.js b/grunt/config/s3.js
index 5fa220f50..514897d63 100644
--- a/grunt/config/s3.js
+++ b/grunt/config/s3.js
@@ -1,7 +1,11 @@
 let config = {};
 try {
   config = require('../../.aws-config.json');
-} catch (e) {}
+} catch (error) {
+  if (error.code !== 'ENOENT') {
+    throw error;
+  }
+}
 
 module.exports = {
   upload_archives: {
diff --git a/scripts/generate/index.js b/scripts/generate/index.js
index 9df5077f6..5eb4c31a1 100644
--- a/scripts/generate/index.js
+++ b/scripts/generate/index.js
@@ -70,9 +70,16 @@ const paths = {
 };
 
 function isDirectory(dir) {
-  let stat;
-  try { stat = fs.statSync(dir); } catch (e) {}
-  return (stat && stat.isDirectory());
+  try {
+    const stat = fs.statSync(dir);
+    return stat.isDirectory();
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return false;
+    }
+
+    throw error;
+  }
 }
 
 function dirFilter(dir, fn) {
diff --git a/src/lib/serializers/json.js b/src/lib/serializers/json.js
index 0bc9b4a10..56efc80a8 100755
--- a/src/lib/serializers/json.js
+++ b/src/lib/serializers/json.js
@@ -39,7 +39,9 @@ Json.prototype.deserialize = function (str) {
   if (typeof str === 'string') {
     try {
       return JSON.parse(str);
-    } catch (e) {}
+    } catch (e) {
+      return undefined;
+    }
   }
 };
 
diff --git a/test/integration/yaml_suite/client_manager.js b/test/integration/yaml_suite/client_manager.js
index 02eb7e72e..3458aaa55 100644
--- a/test/integration/yaml_suite/client_manager.js
+++ b/test/integration/yaml_suite/client_manager.js
@@ -77,7 +77,11 @@ module.exports = {
       if (logConfig && logConfig.type === 'tracer') {
         try {
           fs.unlinkSync(fromRoot('elasticsearch-tracer.log'));
-        } catch (e) {}
+        } catch (error) {
+          if (error.code !== 'ENOENT') {
+            throw error;
+          }
+        }
       }
 
       // close existing client