fix for unhanded NPE when entry from itemMap is null