[PATCH 2/2] Soft-fail on network errors