diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jSpanLogger.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jSpanLogger.java
index db1dbe31c..08468ffbf 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jSpanLogger.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jSpanLogger.java
@@ -23,8 +23,7 @@ import org.slf4j.MDC;
 import org.springframework.cloud.sleuth.Span;
 
 /**
- * Span listener that logs to the console when a span got
- * started / stopped / continued.
+ * Span listener that logs to the console when a span got started / stopped / continued.
  *
  * @author Spencer Gibb
  * @since 1.0.0
@@ -36,8 +35,7 @@ public class Slf4jSpanLogger implements SpanLogger {
 
 	public Slf4jSpanLogger(String nameSkipPattern) {
 		this.nameSkipPattern = Pattern.compile(nameSkipPattern);
-		this.log = org.slf4j.LoggerFactory
-				.getLogger(Slf4jSpanLogger.class);
+		this.log = org.slf4j.LoggerFactory.getLogger(Slf4jSpanLogger.class);
 	}
 
 	Slf4jSpanLogger(String nameSkipPattern, Logger log) {
@@ -66,7 +64,9 @@ public class Slf4jSpanLogger implements SpanLogger {
 
 	@Override
 	public void logStoppedSpan(Span parent, Span span) {
-		log("Stopped span: {}", span);
+		if (span != null) {
+			log("Stopped span: {}", span);
+		}
 		if (span != null && parent != null) {
 			log("With parent: {}", parent);
 			MDC.put(Span.SPAN_ID_NAME, Span.idToHex(parent.getSpanId()));
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java
index 098cd93b1..0f2e6d847 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.sleuth.trace;
 
 import java.util.Random;
 import java.util.concurrent.Callable;
+
 import org.springframework.cloud.sleuth.Sampler;
 import org.springframework.cloud.sleuth.Span;
 import org.springframework.cloud.sleuth.SpanNamer;
@@ -104,8 +105,7 @@ public class DefaultTracer implements Tracer {
 		}
 		Span cur = SpanContextHolder.getCurrentSpan();
 		if (!span.equals(cur)) {
-			ExceptionUtils.warn("Tried to detach trace span but "
-					+ "it is not the current span: " + span
+			ExceptionUtils.warn("Tried to detach trace span but " + "it is not the current span: " + span
 					+ ". You may have forgotten to close or detach " + cur);
 		}
 		else {
@@ -122,9 +122,8 @@ public class DefaultTracer implements Tracer {
 		Span cur = SpanContextHolder.getCurrentSpan();
 		final Span savedSpan = span.getSavedSpan();
 		if (!span.equals(cur)) {
-			ExceptionUtils.warn(
-					"Tried to close span but it is not the current span: " + span
-							+ ".  You may have forgotten to close or detach " + cur);
+			ExceptionUtils.warn("Tried to close span but it is not the current span: " + span
+					+ ".  You may have forgotten to close or detach " + cur);
 		}
 		else {
 			span.stop();
@@ -139,10 +138,9 @@ public class DefaultTracer implements Tracer {
 				}
 			}
 			SpanContextHolder.close(new SpanContextHolder.SpanFunction() {
-				@Override public void apply(Span span) {
-					if (span!=null) {
-						DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
-					}
+				@Override
+				public void apply(Span span) {
+					DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
 				}
 			});
 		}
@@ -196,7 +194,8 @@ public class DefaultTracer implements Tracer {
 	public Span continueSpan(Span span) {
 		if (span != null) {
 			this.spanLogger.logContinuedSpan(span);
-		} else {
+		}
+		else {
 			return null;
 		}
 		Span newSpan = createContinuedSpan(span, SpanContextHolder.getCurrentSpan());