Tidy exception handling