Update onDeselect and onDestroy checking.