Infra 272 better rate limit handling

good catch def1e7a