We now show exceptions from hooks again.

Haven't managed to get #567 fixed yet, but we're a lot closer now.
Probably just a matter of getting the indentation right now.