Added validation to empty items