Please review branch feature/fixStopErrors