Adding check for empty basic_property_info