diff --git a/lib/services/address/index.js b/lib/services/address/index.js
index ece15f32..20bf28f1 100644
--- a/lib/services/address/index.js
+++ b/lib/services/address/index.js
@@ -236,7 +236,7 @@ AddressService.prototype.blockHandler = function(block, connectBlock, callback)
         }
 
         var inputKey = self.encoding.encodeAddressIndexKey(address, true, height, txid, inputIndex, true);
-        
+
         var outputKey = self.encoding.encodeAddressIndexKey(address, true, tx.__height, tx.id, input.outputIndex, false);
         var outputKeyToDelete = self.encoding.encodeAddressIndexKey(address, false, tx.__height, tx.id, input.outputIndex, false);
         var outputValue = self.encoding.encodeAddressIndexValue(output.satoshis, output._scriptBuffer);
@@ -282,7 +282,7 @@ AddressService.prototype._getAddressString = function(script, output) {
     // continue on and return null
   }
 
-  if(output.script.isPublicKeyOut()) {
+  if(output && output.script && output.script.isPublicKeyOut()) {
     return output.script.getPublicKey().toString('hex');
   }