little work on MessageHandlerWrapper