Updated for the refactoring of the error system