Improved errors detecting