diff --git a/bns-test/test/name_register.test.ts b/bns-test/test/name_register.test.ts
index 768802a50..192924cfb 100644
--- a/bns-test/test/name_register.test.ts
+++ b/bns-test/test/name_register.test.ts
@@ -333,6 +333,7 @@ describe("BNS Test Suite - NAME_REGISTER", () => {
 
     receipt = await bns.resolvePrincipal(cases[0].nameOwner)
     expect(receipt.result).include('2008');
+    expect(receipt.result).include('0x626f62');
 
     receipt = await bns.namePreorder(
       cases[0].namespace,
diff --git a/src/chainstate/stacks/boot/bns.clar b/src/chainstate/stacks/boot/bns.clar
index 85ccdee5f..cfd029e82 100644
--- a/src/chainstate/stacks/boot/bns.clar
+++ b/src/chainstate/stacks/boot/bns.clar
@@ -882,8 +882,8 @@
   (match (map-get? owner-name owner)
     name (match (name-resolve (get namespace name) (get name name))
       resolved-name (ok name)
-      error (err error))
-    (err ERR_NAME_NOT_FOUND)))
+      error (err {code: error, name: (some name)}))
+    (err {code: ERR_NAME_NOT_FOUND, name: none})))
 
 (define-read-only (can-receive-name (owner principal))
   (let ((current-owned-name (map-get? owner-name owner)))