Added client validation.