Updated exception message
Updated IncomingMessageHandler, tests and samples