bug fixes + circuit breaker

Change-Id: I442f5786291a30542e475d9201f65fd4e0a32d98