Removed warnings for empty values, unless required.
Updated validation.