Better failover handling