diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
index 60b50b72de1f..6e445868c2db 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
@@ -107,14 +107,12 @@ public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
 			Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 
 		HttpClientContext context = this.contextProvider.apply(method, uri);
-
 		if (context.getCookieStore() == null) {
 			context.setCookieStore(new BasicCookieStore());
 		}
 
-		HttpComponentsClientHttpRequest request = new HttpComponentsClientHttpRequest(method, uri,
-				context, this.dataBufferFactory);
-
+		HttpComponentsClientHttpRequest request =
+				new HttpComponentsClientHttpRequest(method, uri, context, this.dataBufferFactory);
 		return requestCallback.apply(request).then(Mono.defer(() -> execute(request, context)));
 	}
 
@@ -124,7 +122,6 @@ private Mono<ClientHttpResponse> execute(HttpComponentsClientHttpRequest request
 		return Mono.create(sink -> {
 			ReactiveResponseConsumer reactiveResponseConsumer =
 					new ReactiveResponseConsumer(new ResponseCallback(sink, this.dataBufferFactory, context));
-
 			this.client.execute(requestProducer, reactiveResponseConsumer, context, new ResultCallback(sink));
 		});
 	}
@@ -134,11 +131,11 @@ public void close() throws IOException {
 		this.client.close();
 	}
 
+
 	/**
 	 * Callback that invoked when a response is received.
 	 */
-	private static class ResponseCallback
-			implements FutureCallback<Message<HttpResponse, Publisher<ByteBuffer>>> {
+	private static class ResponseCallback implements FutureCallback<Message<HttpResponse, Publisher<ByteBuffer>>> {
 
 		private final MonoSink<ClientHttpResponse> sink;
 
@@ -146,9 +143,9 @@ private static class ResponseCallback
 
 		private final HttpClientContext context;
 
-
 		public ResponseCallback(MonoSink<ClientHttpResponse> sink,
 				DataBufferFactory dataBufferFactory, HttpClientContext context) {
+
 			this.sink = sink;
 			this.dataBufferFactory = dataBufferFactory;
 			this.context = context;
@@ -156,15 +153,12 @@ public ResponseCallback(MonoSink<ClientHttpResponse> sink,
 
 		@Override
 		public void completed(Message<HttpResponse, Publisher<ByteBuffer>> result) {
-			HttpComponentsClientHttpResponse response =
-					new HttpComponentsClientHttpResponse(this.dataBufferFactory, result, this.context);
-			this.sink.success(response);
+			this.sink.success(new HttpComponentsClientHttpResponse(this.dataBufferFactory, result, this.context));
 		}
 
 		@Override
 		public void failed(Exception ex) {
-			Throwable t = (ex instanceof HttpStreamResetException hsre ? hsre.getCause() : ex);
-			this.sink.error(t);
+			this.sink.error(ex instanceof HttpStreamResetException && ex.getCause() != null ? ex.getCause() : ex);
 		}
 
 		@Override
@@ -181,7 +175,6 @@ private static class ResultCallback implements FutureCallback<Void> {
 
 		private final MonoSink<?> sink;
 
-
 		public ResultCallback(MonoSink<?> sink) {
 			this.sink = sink;
 		}
@@ -193,8 +186,7 @@ public void completed(Void result) {
 
 		@Override
 		public void failed(Exception ex) {
-			Throwable t = (ex instanceof HttpStreamResetException hsre ? hsre.getCause() : ex);
-			this.sink.error(t);
+			this.sink.error(ex instanceof HttpStreamResetException && ex.getCause() != null ? ex.getCause() : ex);
 		}
 
 		@Override