WIP retry and error control