Reworked errors and codes