[*][Genlist] Applied upstream r62821 commit. fix bug if pan has been deleted -