Improved management of errors