Improved tolerance of remote-server to communication errors.
Merge pull request #205 from DavidMansolino/RemoteServer

Improved tolerance of remote-server to communication errors.