From 1b0945940bb4e2162577696167aeb0b4b9745f18 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Fri, 9 Dec 2016 18:14:05 +0100
Subject: [PATCH] Test for boolean result before unsubscribe

---
 js/src/api/contract/contract.js     | 2 +-
 js/src/api/subscriptions/manager.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
index 873dac38c..58dd62e7b 100644
--- a/js/src/api/contract/contract.js
+++ b/js/src/api/contract/contract.js
@@ -325,7 +325,7 @@ export default class Contract {
       console.warn('_sendData', subscriptionId, error);
     }
 
-    if (autoRemove && !result) {
+    if (autoRemove && !result && typeof result === 'boolean') {
       this.unsubscribe(subscriptionId);
     }
   }
diff --git a/js/src/api/subscriptions/manager.js b/js/src/api/subscriptions/manager.js
index a2716684b..f1afe685a 100644
--- a/js/src/api/subscriptions/manager.js
+++ b/js/src/api/subscriptions/manager.js
@@ -111,7 +111,7 @@ export default class Manager {
       console.error(`Unable to update callback for subscriptionId ${subscriptionId}`, error);
     }
 
-    if (autoRemove && !result) {
+    if (autoRemove && !result && typeof result === 'boolean') {
       this.unsubscribe(subscriptionId);
     }
   }