Fixed issue with items that do not exist