Improved error handling for network errors
Merge pull request #134 from LinuxJedi/net_errors

Improved error handling for network errors