Merge pull request #17927 from Mangesh-Khairnar/bom-item-fix

 fix: Check fields before making BOM items