Allow testing for exception message. Also improve exception messages.