Handle additional request errors for stability

This has been in production for a long time. This should be the last commit that brings the repository back up to date with what is running in production.