diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 613954c56..f55b14f76 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -203,7 +203,13 @@ MessageSender.prototype = {
       ({ server } = this);
     }
 
-    const { url, id } = await server.putAttachment(attachmentData);
+    const result = await server.putAttachment(attachmentData);
+    if (!result) {
+      return Promise.reject(
+        new Error('Failed to upload data to attachment fileserver')
+      );
+    }
+    const { url, id } = result;
     proto.id = id;
     proto.url = url;
     proto.contentType = attachment.contentType;