Add check to see if items are not null