tidy up some exceptions