Simplify exception hierarchy