diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 881af2985..63f4962c2 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -417,6 +417,10 @@
     "message":
       "This log will be posted publicly online for contributors to view. You may examine and edit it before submitting."
   },
+  "debugLogError": {
+    "message":
+      "Something went wrong with the upload! Please consider manually adding your log to the bug you file."
+  },
   "reportIssue": {
     "message": "Report an issue",
     "description": "Link to open the issue tracker"
diff --git a/js/modules/debuglogs.js b/js/modules/debuglogs.js
index c9e6ae63a..156f3bfa0 100644
--- a/js/modules/debuglogs.js
+++ b/js/modules/debuglogs.js
@@ -14,11 +14,18 @@ const USER_AGENT = `Signal Desktop ${VERSION}`;
 // https://github.com/sindresorhus/got/pull/466
 const submitFormData = (form, url) =>
   new Promise((resolve, reject) => {
-    form.submit(url, error => {
+    form.submit(url, (error, response) => {
       if (error) {
         return reject(error);
       }
 
+      const { statusCode } = response;
+      if (statusCode !== 204) {
+        return reject(
+          new Error(`Failed to upload to S3, got status ${statusCode}`)
+        );
+      }
+
       return resolve();
     });
   });
diff --git a/js/views/debug_log_view.js b/js/views/debug_log_view.js
index bcb71ee1b..303307b76 100644
--- a/js/views/debug_log_view.js
+++ b/js/views/debug_log_view.js
@@ -55,16 +55,25 @@
       this.$('.buttons, textarea').remove();
       this.$('.result').addClass('loading');
 
-      const publishedLogURL = await window.log.publish(text);
-      const view = new Whisper.DebugLogLinkView({
-        url: publishedLogURL,
-        el: this.$('.result'),
-      });
-      this.$('.loading').removeClass('loading');
-      view.render();
-      this.$('.link')
-        .focus()
-        .select();
+      try {
+        const publishedLogURL = await window.log.publish(text);
+        const view = new Whisper.DebugLogLinkView({
+          url: publishedLogURL,
+          el: this.$('.result'),
+        });
+        this.$('.loading').removeClass('loading');
+        view.render();
+        this.$('.link')
+          .focus()
+          .select();
+      } catch (error) {
+        console.log(
+          'DebugLogView error:',
+          error && error.stack ? error.stack : error
+        );
+        this.$('.loading').removeClass('loading');
+        this.$('.result').text(i18n('debugLogError'));
+      }
     },
   });
 })();