Fix domain message/exception handling.