Updated validators to return error message