ENH: Improved network error management