Validator refactored to parse $message properly