cleaned up a few exception messages