Added more timeout exception checking to http_client.py.

Some errors are still unhandled when a server timeout occurs, this adds the exceptions into the right place.