make network errors less DRY Upstream-commit: 3e7d86492501bff7e64288e42cf8cd70821fd59e Component: engine