Minor improvment to failing using as clear exception hierarchies as
possible.