TRUNK-4414 - Ensure message correctly reflects validation error
Merge pull request #972 from vinayvenu/TRUNK-4414

TRUNK-4414 - Ensure message correctly reflects validation error