Added validation for presence of main item