Improved error handling in case server dropped client
Improved error handling in case server dropped client

rwaldron/testswarm,newzly/testswarm,kcomkar/testswarm,newzly/testswarm,concord-consortium/testswarm,newzly/testswarm,kcomkar/testswarm,newzly/testswarm,concord-consortium/testswarm,rwaldron/testswarm