Improve error hierarchy.