Improved error states and detection