Improve WITH-CLOSE-ON-ERROR.