Added some handling for replyTo address.