Improved errors control