[3044] Avoid NP when selection is removed