Use circuit breaker

- [ ] @sneal 
- [ ] @creg 

please review
this is the section that fixes the bug we're currently seeing.