teiiddes-2164

Corrected field validation logic. Also added check for null or empty string when validating the security type. This is equivalent to "None".