diff --git a/packages/ens-test-env/src/manager.js b/packages/ens-test-env/src/manager.js
index 52ef8a15..0683db2a 100644
--- a/packages/ens-test-env/src/manager.js
+++ b/packages/ens-test-env/src/manager.js
@@ -157,6 +157,7 @@ const awaitCommand = async (name, command) => {
     deploy.stdout.pipe(outPrepender).pipe(process.stdout)
   }
   deploy.stderr.pipe(errPrepender).pipe(process.stderr)
+  deploy.stderr.on('data', cleanup.bind(null, { exit: true }))
   return new Promise((resolve) => deploy.on('exit', () => resolve()))
 }
 
diff --git a/packages/ensjs/deploy/01_delete_names.cjs b/packages/ensjs/deploy/01_delete_names.cjs
index abda49dd..73402c68 100644
--- a/packages/ensjs/deploy/01_delete_names.cjs
+++ b/packages/ensjs/deploy/01_delete_names.cjs
@@ -29,9 +29,6 @@ const func = async function (hre) {
     const label = labelhash(labels.shift())
     const node = namehash(labels.join('.'))
 
-    console.log("--------------- DELETE NAME ---------------")
-
-
     const tx = await registry.setSubnodeRecord(
       node,
       label,
@@ -58,6 +55,13 @@ const func = async function (hre) {
   await deleteName(name1)
   await deleteName(name2)
 
+  for (const name of [name1, name2]) {
+    const owner = await registry.owner(namehash(name))
+    if (owner !== EMPTY_ADDRESS) {
+      throw new Error(`Failed to delete name ${name}`)
+    }
+  }
+
   return true
 }