diff --git a/pkg/compiler/test/analyses/api_allowed.json b/pkg/compiler/test/analyses/api_allowed.json
index c895b2993b3..dcb26d7337e 100644
--- a/pkg/compiler/test/analyses/api_allowed.json
+++ b/pkg/compiler/test/analyses/api_allowed.json
@@ -1,6 +1,5 @@
 {
   "org-dartlang-sdk:///lib/_http/http_impl.dart": {
-    "Dynamic access of 'message'.": 3,
     "Dynamic access of 'address'.": 1,
     "Dynamic access of 'port'.": 1,
     "Dynamic invocation of 'listen'.": 1,
diff --git a/sdk/lib/_http/http_impl.dart b/sdk/lib/_http/http_impl.dart
index 4f79d541c9f..1ecb486be6b 100644
--- a/sdk/lib/_http/http_impl.dart
+++ b/sdk/lib/_http/http_impl.dart
@@ -438,8 +438,8 @@ class _HttpIncoming extends Stream<Uint8List> {
       {Function? onError, void Function()? onDone, bool? cancelOnError}) {
     hasSubscriber = true;
     return _stream.handleError((error) {
-      throw HttpException(error.message, uri: uri);
-    }).listen(onData,
+      throw HttpException((error as HttpException).message, uri: uri);
+    }, test: (error) => error is HttpException).listen(onData,
         onError: onError, onDone: onDone, cancelOnError: cancelOnError);
   }
 
@@ -2060,15 +2060,24 @@ class _HttpClientConnection {
         incoming.drain().then((_) {
           _subscription!.resume();
         }).catchError((dynamic error, StackTrace stackTrace) {
+          String message;
+          if (error is HttpException) {
+            message = error.message;
+          } else if (error is SocketException) {
+            message = error.message;
+          } else {
+            throw error;
+          }
           _nextResponseCompleter!.completeError(
-              HttpException(error.message, uri: _currentUri), stackTrace);
+              HttpException(message, uri: _currentUri), stackTrace);
           _nextResponseCompleter = null;
-        });
+        }, test: (error) => error is HttpException || error is SocketException);
       } else {
         _nextResponseCompleter!.complete(incoming);
         _nextResponseCompleter = null;
       }
     }, onError: (dynamic error, StackTrace stackTrace) {
+      if (error is! HttpException) throw error; // Rethrow.
       _nextResponseCompleter?.completeError(
           HttpException(error.message, uri: _currentUri), stackTrace);
       _nextResponseCompleter = null;
diff --git a/sdk/lib/convert/json.dart b/sdk/lib/convert/json.dart
index c3a6793c0ff..d85f75ea958 100644
--- a/sdk/lib/convert/json.dart
+++ b/sdk/lib/convert/json.dart
@@ -623,6 +623,7 @@ external dynamic _parseJson(String source, reviver(key, value)?);
 
 // Implementation of encoder/stringifier.
 
+// ignore: avoid_dynamic_calls
 dynamic _defaultToEncodable(dynamic object) => object.toJson();
 
 /// JSON encoder that traverses an object structure and writes JSON source.