Better handle HA validation

We need to better validate that updates don't break our HA configuration.