r16235: Don't update minor_status when cleaning up on error. This restores