From 3c4d6b503b81fb0dd66df39f092e32d259b9cb21 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Tue, 29 Dec 2015 14:21:38 -0800
Subject: [PATCH] fix(mail-rules): Bail if a message is missing a thread

---
 src/mail-rules-processor.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mail-rules-processor.coffee b/src/mail-rules-processor.coffee
index 9ae3279d3..0c23eb77d 100644
--- a/src/mail-rules-processor.coffee
+++ b/src/mail-rules-processor.coffee
@@ -100,6 +100,7 @@ class MailRulesProcessor
         # We always pull the thread from the database, even though it may be in
         # `incoming.thread`, because rules may be modifying it as they run!
         DatabaseStore.find(Thread, message.threadId).then (thread) =>
+          return console.warn("Cannot find thread #{message.threadId} to process mail rules.") unless thread
           @_applyRuleToMessage(rule, message, thread)
 
   _checkRuleForMessage: (rule, message) =>