Fix bogus exception hierarchy