From 04679721b7502a361f9fc9772f51cedaa885477b Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 24 Aug 2018 10:18:02 +0200
Subject: [PATCH] Fixes potential NPE; fixes gh-1072

---
 .../web/client/TraceWebClientAutoConfiguration.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
index 73edba394..04507b6df 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
@@ -403,9 +403,11 @@ class TracingHttpClientInstrumentation {
 		return responseMono.doOnSuccessOrError((httpClientResponse, throwable) -> {
 			try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.get())) {
 				// status codes and CR
-				this.handler.handleReceive(httpClientResponse, throwable, span.get());
-				if (log.isDebugEnabled()) {
-					log.debug("Setting client sent spans");
+				if (span.get() != null) {
+					this.handler.handleReceive(httpClientResponse, throwable, span.get());
+					if (log.isDebugEnabled()) {
+						log.debug("Setting client sent spans");
+					}
 				}
 			}
 		});