Updated after the refactoring of the error system