diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/HttpClientBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/HttpClientBeanPostProcessor.java
index c76421739..7c3490411 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/HttpClientBeanPostProcessor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/HttpClientBeanPostProcessor.java
@@ -249,6 +249,9 @@ class HttpClientBeanPostProcessor implements BeanPostProcessor {
 
 		protected void handle(HttpClientResponse httpClientResponse,
 				Throwable throwable) {
+			if (httpClientResponse == null) {
+				return;
+			}
 			AtomicReference reference = httpClientResponse.currentContext()
 					.getOrDefault(AtomicReference.class, null);
 			if (reference == null || reference.get() == null) {
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue546/Issue546Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue546/Issue546Tests.java
index 21647e580..8a45d5696 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue546/Issue546Tests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue546/Issue546Tests.java
@@ -77,8 +77,7 @@ class Issue546TestsApp {
 @RestController
 class Controller {
 
-	private static final Log log = LogFactory
-			.getLog(Controller.class);
+	private static final Log log = LogFactory.getLog(Controller.class);
 
 	private final AsyncRestTemplate traceAsyncRestTemplate;
 
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java
index 0c3ff4a73..d07638ed5 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java
@@ -69,8 +69,7 @@ public class WebClientExceptionTests {
 	@ClassRule
 	public static final SpringClassRule SCR = new SpringClassRule();
 
-	private static final Log log = LogFactory
-			.getLog(WebClientExceptionTests.class);
+	private static final Log log = LogFactory.getLog(WebClientExceptionTests.class);
 
 	@Rule
 	public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java
index 165a0b0df..9797b75d5 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulIntegrationTests.java
@@ -74,8 +74,7 @@ import static org.assertj.core.api.BDDAssertions.then;
 @DirtiesContext
 public class TraceZuulIntegrationTests {
 
-	private static final Log log = LogFactory
-			.getLog(TraceZuulIntegrationTests.class);
+	private static final Log log = LogFactory.getLog(TraceZuulIntegrationTests.class);
 
 	@Autowired
 	Tracing tracing;
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
index b4fe46235..f855dbc91 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
@@ -30,8 +30,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
  */
 public abstract class AbstractIntegrationTest {
 
-	protected static final Log log = LogFactory
-			.getLog(AbstractIntegrationTest.class);
+	protected static final Log log = LogFactory.getLog(AbstractIntegrationTest.class);
 
 	protected static final int POLL_INTERVAL = 1;
 
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/DefaultEndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/DefaultEndpointLocator.java
index 776496b0c..0a44df8fa 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/DefaultEndpointLocator.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/DefaultEndpointLocator.java
@@ -48,8 +48,7 @@ import org.springframework.util.StringUtils;
 public class DefaultEndpointLocator implements EndpointLocator,
 		ApplicationListener<ServletWebServerInitializedEvent> {
 
-	private static final Log log = LogFactory
-			.getLog(DefaultEndpointLocator.class);
+	private static final Log log = LogFactory.getLog(DefaultEndpointLocator.class);
 
 	private static final String IP_ADDRESS_PROP_NAME = "spring.cloud.client.ipAddress";