Use custom validator message instead of the generic one. Fixes #3640
Add tests for custom validator message. Validates #3640