minor cleanups of exceptions