better error handling

1 files changed, 6 insertions, 1 deletions

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 5a307df3..6ab130a7 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -104,7 +104,12 @@ async function apiTemplateRender(template, data, dynamic) {
             const sequence = utilBackend().sequenceNew();
             const handler = event => {
                 if (event.data.sequence === sequence) {
-                    resolve(event.data.result);
+                    if (event.data.command === 'error') {
+                        reject(event.data.result);
+                    } else {
+                        resolve(event.data.result);
+                    }
+
                     window.removeEventListener('message', handler);
                 }
             };