Bettter handling of non existent items