diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4b1f2724a03e81d7c5e86518abf699517b3d8eb4..e3545e70857257d1b238f924351af4ffb5f109d0 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3268,7 +3268,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom,
     virCheckFlags(0, -1);
 
     if (!(vm = testDomObjFromDomain(dom)))
-        goto cleanup;
+        return -1;
 
     if (virDomainObjCheckActive(vm) < 0)
         goto cleanup;
@@ -3285,11 +3285,11 @@ static int testDomainGetDiskErrors(virDomainPtr dom,
     }
 
  cleanup:
-    virDomainObjEndAPI(&vm);
     if (ret < 0) {
         for (i = 0; i < MIN(vm->def->ndisks, maxerrors); i++)
             VIR_FREE(errors[i].disk);
     }
+    virDomainObjEndAPI(&vm);
     return ret;
 }