Small exception changes.