From e6ab4db537595f27fa7ff391a719e961440100cd Mon Sep 17 00:00:00 2001
From: Xavier O'Neil <xavier@openfin.co>
Date: Thu, 3 Aug 2017 13:46:41 -0400
Subject: [PATCH] unload hotfix (#132)

---
 src/browser/subscription_manager.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/browser/subscription_manager.js b/src/browser/subscription_manager.js
index 170294d25..2e36ad2f1 100644
--- a/src/browser/subscription_manager.js
+++ b/src/browser/subscription_manager.js
@@ -59,9 +59,14 @@ function SubscriptionManager() {
     }
 
     function removeSubscription(identity, ...args) {
-        let key = genSubscriptionKey.apply(null, args),
-            identityKey = identityToKey(identity),
-            subscription = subscriptionList.get(identityKey).get(key);
+        const key = genSubscriptionKey.apply(null, args);
+        const identityKey = identityToKey(identity);
+        const subscriptionId = subscriptionList.get(identityKey);
+        const subscription = subscriptionId && subscriptionId.get(key);
+
+        if (!subscription) {
+            return;
+        }
 
         subscription.refCount--;
         if (subscription.refCount <= 0) {