Changes to error in preparation for switching over to a new error
interface.