Add null check to uniqueness validator.
Merge branch 'uniqueness_null_check'