Untested code for MessageHandler