a little more exception tidying