Rework OrDo to OnFail