Refactor stage error reporting