From e03d7b9df6421111de0d1368afe2827055576465 Mon Sep 17 00:00:00 2001
From: Jackie Luo <jackiehluo@gmail.com>
Date: Thu, 29 Dec 2016 16:00:30 -0800
Subject: [PATCH] fix(multi-send): Check that other message exists

---
 src/K2                                       | 2 +-
 src/flux/tasks/reconcile-multi-send-task.es6 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/K2 b/src/K2
index be1d772f3..a0d83b605 160000
--- a/src/K2
+++ b/src/K2
@@ -1 +1 @@
-Subproject commit be1d772f3204184575742048e1ccd0a2c7d75e50
+Subproject commit a0d83b605af0cb78c5687e748a22ddb32d463919
diff --git a/src/flux/tasks/reconcile-multi-send-task.es6 b/src/flux/tasks/reconcile-multi-send-task.es6
index 4aa0fe06d..8f845f4e9 100644
--- a/src/flux/tasks/reconcile-multi-send-task.es6
+++ b/src/flux/tasks/reconcile-multi-send-task.es6
@@ -12,7 +12,7 @@ export default class ReconcileMultiSendTask extends Task {
   }
 
   isDependentOnTask(other) {
-    return (other instanceof SendDraftTask) && (other.message.clientId === this.message.clientId);
+    return (other instanceof SendDraftTask) && (other.message) && (other.message.clientId === this.message.clientId);
   }
 
   performLocal() {