Fix exception on list extra handling