diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 075bd2343..c58e39a12 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39595,6 +39595,7 @@ function generateKeys(count, progressCallback) {
                 ev.error = error;
                 ev.proto = envelope;
                 this.target.dispatchEvent(ev);
+                throw error; // reject this promise
             }.bind(this));
         },
         handleSentMessage: function(destination, timestamp, message) {
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 6e29ea536..a96a2edea 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -99,6 +99,7 @@
                 ev.error = error;
                 ev.proto = envelope;
                 this.target.dispatchEvent(ev);
+                throw error; // reject this promise
             }.bind(this));
         },
         handleSentMessage: function(destination, timestamp, message) {