--- libpkg/pkg_ports.c.orig
+++ libpkg/pkg_ports.c
@@ -1293,7 +1293,7 @@
     const char *reloc, bool testing)
 {
 	const char *location;
-	int rc = EPKG_OK;
+	int rc = EPKG_OK, frc;
 	UT_string *message;
 	struct pkg_message *msg;
 
@@ -1354,7 +1362,7 @@
 	}
 
 cleanup:
-	pkgdb_register_finale(db, rc, NULL);
+	frc = pkgdb_register_finale(db, rc, NULL);
 
-	return (rc);
+	return ((rc == EPKG_OK) ? frc : rc);
 }