Improve error classes.