better fault tolerance for REST pull/push