add back exception message sent to handler in separate commit