Fix selectors when the onselect callback raises

Fix selectors when the onselect callback raises #21088