Improve information captured in UnknownException
7 files changed