Add one case where failure to remove is not a fatal error. And be more
specific about the error that is caught -- OSError only.