Better circuit breaker handling