diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js
index d0fe2a65..5105e8de 100644
--- a/lib/blockchain/chain.js
+++ b/lib/blockchain/chain.js
@@ -923,7 +923,7 @@ Chain.prototype.setBestChain = async function setBestChain(entry, block, prev, f
   if (entry.hasUnknown()) {
     this.logger.warning(
       'Unknown version bits in block %d: %d.',
-      entry.height, entry.version);
+      entry.height, util.hex32(entry.version));
   }
 
   // Otherwise, everything is in order.
@@ -1838,8 +1838,10 @@ Chain.prototype._getLocator = async function getLocator(start) {
 
   entry = await this.db.getEntry(start);
 
-  if (!entry)
-    throw new Error('Tip not found.');
+  if (!entry) {
+    entry = this.tip;
+    hashes.push(start);
+  }
 
   hash = entry.hash;
   height = entry.height;