Adding some protections against anomalous conditions for the new selections