diff --git a/src/components/App.js b/src/components/App.js
index 18f3618..e18d19f 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -197,7 +197,7 @@ class App extends React.Component {
       }
     } catch (e) {
       return this.setState({
-        error: `Unable to connect to ${signerProvider?.label || 'signer'}: ${e.message}`,
+        error: `Unable to connect to ${signerProvider?.label || 'signer'}: ${e?.message}`,
         address: null,
         wallet: null,
       })
diff --git a/src/components/Delegations.js b/src/components/Delegations.js
index 47254cc..eeda212 100644
--- a/src/components/Delegations.js
+++ b/src/components/Delegations.js
@@ -332,7 +332,7 @@ class Delegations extends React.Component {
   }
 
   restakePossible() {
-    return this.props.address && this.props.wallet.authzSupport() && this.restakeSupport();
+    return this.props.address && this.props.wallet?.authzSupport() && this.restakeSupport();
   }
 
   totalRewards(validators) {
@@ -432,7 +432,7 @@ class Delegations extends React.Component {
         )}
         {!this.authzSupport() && (
           <AlertMessage variant="info" dismissible={false}>
-            {this.props.network.prettyName} doesn't support Authz just yet. You can stake and compound manually, REStake will update automatically when support is added.
+            {this.props.network.prettyName} doesn't support Authz just yet. You can stake and compound manually until support is added.
           </AlertMessage>
         )}
         {this.authzSupport() &&
diff --git a/src/components/NetworkChecks.js b/src/components/NetworkChecks.js
index d19655f..e8a0fe9 100644
--- a/src/components/NetworkChecks.js
+++ b/src/components/NetworkChecks.js
@@ -83,7 +83,7 @@ function NetworkChecks(props) {
         renderCheck({
           title: !network.authzAminoGenericOnly ? <strong>Full Authz support</strong> : 'Authz support',
           failTitle: 'Authz not supported',
-          failDescription: "This network doesn't support Authz just yet. You can stake and compound manually, REStake will update automatically when support is added.",
+          failDescription: "This network doesn't support Authz just yet. You can stake and compound manually until support is added.",
           state: network.authzSupport,
           identifier: 'authz'
         }),