More robust if statements