Tidy up exceptions