diff --git a/bin/start.js b/bin/start.js
index 0c4f6204..24d2a122 100644
--- a/bin/start.js
+++ b/bin/start.js
@@ -47,23 +47,25 @@ node.on('ready', function() {
     });
 
     socket.on('message', function(message, socketCallback) {
-      if (methodsMap[message.command]) {
+      if (methodsMap[message.method]) {
         var params = message.params;
 
         if(!params || !params.length) {
           params = [];
         }
 
-        if(params.length !== methodsMap[message.command].args) {
+        if(params.length !== methodsMap[message.method].args) {
           return socketCallback({
-            error: 'Expected ' + methodsMap[message.command].args + ' parameters'
+            error: 'Expected ' + methodsMap[message.method].args + ' parameters'
           });
         }
 
         var callback = function(err, result) {
           var response = {};
           if(err) {
-            response.error = err;
+            response.error = {
+              message: err.toString()
+            };
           }
 
           if(result) {
@@ -78,7 +80,7 @@ node.on('ready', function() {
         };
 
         params = params.concat(callback);
-        methodsMap[message.command].fn.apply(this, params);
+        methodsMap[message.method].fn.apply(this, params);
       } else {
         socketCallback({
           error: 'Method Not Found'
diff --git a/example/client.js b/example/client.js
index 2acb35b5..88a1cf9c 100644
--- a/example/client.js
+++ b/example/client.js
@@ -10,7 +10,7 @@ socket.on('disconnect', function(){
 });
 
 var message = {
-  command: 'getOutputs',
+  method: 'getOutputs',
   params: ['1HTxCVrXuthad6YW5895K98XmVsdMvvBSw', true]
 };
 
@@ -24,7 +24,7 @@ socket.send(message, function(response) {
 });
 
 var message2 = {
-  command: 'getTransaction',
+  method: 'getTransaction',
   params: ['4f793f67fc7465f14fa3a8d3727fa7d133cdb2f298234548b94a5f08b6f4103e', true]
 };
 
diff --git a/lib/modules/address.js b/lib/modules/address.js
index 93863b21..d20e8bab 100644
--- a/lib/modules/address.js
+++ b/lib/modules/address.js
@@ -9,6 +9,7 @@ var levelup = chainlib.deps.levelup;
 var errors = chainlib.errors;
 var bitcore = require('bitcore');
 var $ = bitcore.util.preconditions;
+var _ = bitcore.deps._;
 var EventEmitter = require('events').EventEmitter;
 var PublicKey = bitcore.PublicKey;
 var Address = bitcore.Address;
@@ -172,6 +173,7 @@ AddressModule.prototype.subscribe = function(name, emitter, addresses) {
 
 AddressModule.prototype.unsubscribe = function(name, emitter, addresses) {
   $.checkArgument(emitter instanceof EventEmitter, 'First argument is expected to be an EventEmitter');
+  $.checkArgument(Array.isArray(addresses) || _.isUndefined(addresses), 'Second argument is expected to be an Array of addresses or undefined');
 
   if(!addresses) {
     return this.unsubscribeAll(name, emitter);
diff --git a/package.json b/package.json
index 466d302f..e7418d4b 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,7 @@
     "memdown": "^1.0.0",
     "mkdirp": "0.5.0",
     "nan": "1.3.0",
-    "socket.io": "^1.3.6",
-    "tiny": "0.0.10"
+    "socket.io": "^1.3.6"
   },
   "devDependencies": {
     "benchmark": "1.0.0",