From b3251a8de2feeb3f765b87feba14e14fba7d2c1e Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Tue, 20 Mar 2018 17:25:26 -0400
Subject: [PATCH] Prevent potential NPE

---
 js/views/message_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/views/message_view.js b/js/views/message_view.js
index cc619e436..e4ae46425 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -413,7 +413,7 @@
       }
 
       const loadData = Attachment.loadData(migrationContext.readAttachmentData);
-      const attachments = this.model.get('attachments');
+      const attachments = this.model.get('attachments') || [];
       const loadedAttachmentViews = Promise.all(attachments.map(attachment =>
         new Promise(async (resolve) => {
           const attachmentWithData = await loadData(attachment);