Add support for exception type and message