LP#1755258 Improve network error handling