diff --git a/lib/Address.js b/lib/Address.js
index 9fb0799..8a0f456 100644
--- a/lib/Address.js
+++ b/lib/Address.js
@@ -119,7 +119,7 @@ Address.fromScriptPubKey = function(scriptPubKey, network) {
       case Script.TX_MULTISIG:
         version = networks[network].addressVersion;
         for(var i in payload)
-          if(payload[i])
+          if(Buffer.isBuffer(payload[i])) 
             payload[i] = coinUtil.sha256ripe160(payload[i]);
         break;
       case Script.TX_SCRIPTHASH:
@@ -127,7 +127,7 @@ Address.fromScriptPubKey = function(scriptPubKey, network) {
         break;
     }
     for(var i in payload)
-      if(payload[i])
+      if(Buffer.isBuffer(payload[i]))
         ret.push(new Address(version,payload[i]));
   }
   return ret;