Improve validation fail messages
2.5.14