Small improvements to exceptions file