minor tweeks to exceptions