More tweaking to exceptions.