Improve errors control