fix exception messages a bit