diff --git a/doc/api/http2.md b/doc/api/http2.md
index a98c0f52b74b39..0bcb574fdce78b 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -271,12 +271,17 @@ server.on('stream', (stream, headers) => {
     'content-type': 'text/html',
     ':status': 200
   });
+  stream.on('error', (error) => console.error(error));
   stream.end('<h1>Hello World</h1>');
 });
 
 server.listen(80);
 ```
 
+Even though HTTP/2 streams and network sockets are not in a 1:1 correspondence,
+a network error will destroy each individual stream and must be handled on the
+stream level, as shown above.
+
 #### Event: 'timeout'
 <!-- YAML
 added: v8.4.0
diff --git a/test/parallel/test-http2-respond-with-file-connection-abort.js b/test/parallel/test-http2-respond-with-file-connection-abort.js
index 25926b2c9805a3..6c8337ba8bc5b6 100644
--- a/test/parallel/test-http2-respond-with-file-connection-abort.js
+++ b/test/parallel/test-http2-respond-with-file-connection-abort.js
@@ -3,6 +3,7 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
+const assert = require('assert');
 const http2 = require('http2');
 const net = require('net');
 
@@ -12,6 +13,7 @@ const {
 
 const server = http2.createServer();
 server.on('stream', common.mustCall((stream) => {
+  stream.on('error', (err) => assert.strictEqual(err.code, 'ECONNRESET'));
   stream.respondWithFile(process.execPath, {
     [HTTP2_HEADER_CONTENT_TYPE]: 'application/octet-stream'
   });
@@ -22,16 +24,9 @@ server.listen(0, common.mustCall(() => {
   const req = client.request();
 
   req.on('response', common.mustCall(() => {}));
-  req.on('data', common.mustCall(() => {
+  req.on('data', common.mustCallAtLeast(() => {
     net.Socket.prototype.destroy.call(client.socket);
     server.close();
   }));
   req.end();
 }));
-
-// TODO(addaleax): This is a *hack*. HTTP/2 needs to have a proper way of
-// dealing with this kind of issue.
-process.once('uncaughtException', (err) => {
-  if (err.code === 'ECONNRESET') return;
-  throw err;
-});