Improved tolerance of remote-server to communication errors.

Improved tolerance of remote-server to communication errors.