Bug in Error messages from Validator fixed
Merge with local branch