From e29335ae9109e9da7c2c23ce1893ff7c89c4fbf2 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Wed, 27 Jan 2016 11:13:58 -0800
Subject: [PATCH] Fix exception "Cannot read property 'replaceModel' of null"

---
 src/flux/models/query-subscription.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/flux/models/query-subscription.coffee b/src/flux/models/query-subscription.coffee
index 9e2e37116..885d92941 100644
--- a/src/flux/models/query-subscription.coffee
+++ b/src/flux/models/query-subscription.coffee
@@ -140,6 +140,7 @@ class QuerySubscription
       return @log("Update (#{version}) - No missing Ids") if ids.length is 0
       @log("Update (#{version}) - Fetching missing Ids: #{ids}")
       return DatabaseStore.findAll(@_query._klass, {id: ids}).then (models) =>
+        return @log("Update (#{version}) - Cancelled @ Step 1.5") unless version is @_version
         @log("Update (#{version}) - Fetched missing Ids")
         @_set.replaceModel(m) for m in models
     .then =>