Merge "scheduler: better handle format status error"