Exception haddock improvements