diff --git a/dist/trust-min.js b/dist/trust-min.js
index 6800b52f..527b552b 100644
--- a/dist/trust-min.js
+++ b/dist/trust-min.js
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b909342aace2dbceb84932b805ba7512fca66af4948aec15353e0483986121b3
-size 905929
+oid sha256:e7cfcf1c7453298f3998ec5bdd77a4ace4a029b71027135a29b8004cc36fb694
+size 906477
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
index b55bcfad..693a3766 100644
--- a/src/.eslintrc.js
+++ b/src/.eslintrc.js
@@ -1,31 +1,20 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "node": true,
-        "commonjs": true,
-        "es6": true,
-        "jest": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "sourceType": "module",
-        "ecmaVersion": 2017
-    },
-    "rules": {
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "warn",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "no-console": [
-            "off"
-        ]
-    }
+  env: {
+    browser: true,
+    node: true,
+    commonjs: true,
+    es6: true,
+    jest: true,
+  },
+  extends: "eslint:recommended",
+  parserOptions: {
+    sourceType: "module",
+    ecmaVersion: 2020,
+  },
+  rules: {
+    "linebreak-style": ["error", "unix"],
+    quotes: ["warn", "double"],
+    semi: ["error", "always"],
+    "no-console": ["off"],
+  },
 };
diff --git a/src/ethereum_provider.js b/src/ethereum_provider.js
index f1135ad9..5abf05d5 100644
--- a/src/ethereum_provider.js
+++ b/src/ethereum_provider.js
@@ -263,7 +263,10 @@ class TrustWeb3Provider extends BaseProvider {
     var message;
     let address;
 
-    if (this.address === payload.params[0].toLowerCase()) {
+    if (
+      typeof payload.params?.[0].toLowerCase() === "string" &&
+      this.address === payload.params?.[0].toLowerCase()
+    ) {
       message = payload.params[1];
       address = payload.params[0];
     } else {
@@ -297,7 +300,10 @@ class TrustWeb3Provider extends BaseProvider {
     let address;
     let data;
 
-    if (this.address === payload.params[0].toLowerCase()) {
+    if (
+      typeof payload.params?.[0] === "string" &&
+      this.address === payload.params?.[0].toLowerCase()
+    ) {
       data = payload.params[1];
       address = payload.params[0];
     } else {