TRUNK-4414 - Ensure message correctly reflects validation error

(cherry picked from commit f607e0ebf115450fbde1c953d6734ff8e317d358)