added None check to validators.