Merge b8a3168 into 4511c75

moscajs · Feb 8, 2016 · 38d73fa · 38d73fa
2 parents 4511c75 + b8a3168
commit 38d73fa
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/handlers/unsubscribe.js b/lib/handlers/unsubscribe.js
@@ -37,14 +37,16 @@ function actualUnsubscribe (client, packet, done) {
 function doUnsubscribe (sub, done) {
   var client = this.client
   var broker = client.broker
-  var func = client.subscriptions[sub].func
-
-  delete client.subscriptions[sub]
-
-  broker.unsubscribe(
-    sub,
-    func,
-    done)
+  if (client.subscriptions[sub]) {
+    var func = client.subscriptions[sub].func
+    delete client.subscriptions[sub]
+    broker.unsubscribe(
+      sub,
+      func,
+      done)
+  } else {
+    done()
+  }
 }
 
 function completeUnsubscribe (err) {