Add null check for item names