Fix empty items blowing things up