diff --git a/src/components/compose.jsx b/src/components/compose.jsx
index 08bb5b58..06b277f2 100644
--- a/src/components/compose.jsx
+++ b/src/components/compose.jsx
@@ -58,13 +58,19 @@ function Compose({
   ).info;
 
   const configuration = useMemo(() => {
-    const instances = store.local.getJSON('instances');
-    const currentInstance = accounts.find(
-      (a) => a.info.id === currentAccount,
-    ).instanceURL;
-    const config = instances[currentInstance].configuration;
-    console.log(config);
-    return config;
+    try {
+      const instances = store.local.getJSON('instances');
+      const currentInstance = accounts.find(
+        (a) => a.info.id === currentAccount,
+      ).instanceURL;
+      const config = instances[currentInstance].configuration;
+      console.log(config);
+      return config;
+    } catch (e) {
+      alert('Failed to load instance configuration. Please try again.');
+      console.error(e);
+      return {};
+    }
   }, []);
 
   const {
diff --git a/src/components/status.jsx b/src/components/status.jsx
index 7651f03e..a1e4dddc 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -953,7 +953,7 @@ function Poll({ poll, readOnly, onUpdate = () => {} }) {
           setUIState('loading');
           (async () => {
             try {
-              const pollResponse = await masto.v1.poll.fetch(id);
+              const pollResponse = await masto.v1.polls.fetch(id);
               onUpdate(pollResponse);
             } catch (e) {
               // Silent fail
@@ -1038,7 +1038,7 @@ function Poll({ poll, readOnly, onUpdate = () => {} }) {
             });
             console.log(votes);
             setUIState('loading');
-            const pollResponse = await masto.v1.poll.vote(id, {
+            const pollResponse = await masto.v1.polls.vote(id, {
               choices: votes,
             });
             console.log(pollResponse);
@@ -1087,7 +1087,7 @@ function Poll({ poll, readOnly, onUpdate = () => {} }) {
                   setUIState('loading');
                   (async () => {
                     try {
-                      const pollResponse = await masto.v1.poll.fetch(id);
+                      const pollResponse = await masto.v1.polls.fetch(id);
                       onUpdate(pollResponse);
                     } catch (e) {
                       // Silent fail