minor clean up in exceptions