SWITCHYARD-1314 Message Validator improvement