Replace accidental unwind-protect with ignore-errors form