Add null check in JS before replacing message body

Fixes b/13060462.

Change-Id: I6c33e56cd3e99c2021d41accca2bd129429dbeee

1 files changed, 8 insertions, 2 deletions

diff --git a/assets/script.js b/assets/script.js
index 2bf5d9c54..32cc85686 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -754,8 +754,14 @@ function replaceMessageBodies(messageIds) {
     for (i = 0, len = messageIds.length; i < len; i++) {
         id = messageIds[i];
         msgContentDiv = document.querySelector("#" + id + " > .mail-message-content");
-        msgContentDiv.innerHTML = window.mail.getMessageBody(id);
-        processNewMessageBody(msgContentDiv);
+        // Check if we actually have a div before trying to replace this message body.
+        if (msgContentDiv) {
+            msgContentDiv.innerHTML = window.mail.getMessageBody(id);
+            processNewMessageBody(msgContentDiv);
+        } else {
+            // There's no message div, just skip it. We're in a really busted state.
+            console.log("Mail message content for msg " + id + " to replace not found.");
+        }
     }
     disablePostForms();
     measurePositions();