Fix exception hierarchy