diff --git a/pressure-vessel/runtime.c b/pressure-vessel/runtime.c
index 36cd71f4f73a090d2bef58d36ecc0e625690dc43..49a798647c4c086800504d6e3f7141307096c9cb 100644
--- a/pressure-vessel/runtime.c
+++ b/pressure-vessel/runtime.c
@@ -2846,9 +2846,11 @@ pv_runtime_remove_overridden_libraries (PvRuntime *self,
 
           if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&iters[i], &dent,
                                                            NULL, error))
-            return glnx_prefix_error (error, "Unable to iterate over \"%s/%s\"",
-                                      self->mutable_sysroot,
-                                      libdir);
+            {
+              glnx_prefix_error (error, "Unable to iterate over \"%s/%s\"",
+                                 self->mutable_sysroot, libdir);
+              goto out;
+            }
 
           if (dent == NULL)
             break;