diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java
index 96ed118a7..9380c1673 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java
@@ -251,7 +251,7 @@ public class TraceFilter extends GenericFilterBean {
 			return false;
 		}
 		HttpStatus httpStatus = HttpStatus.valueOf(response.getStatus());
-		return httpStatus.is2xxSuccessful() || httpStatus.is3xxRedirection();
+		return httpStatus.is1xxInformational() || httpStatus.is2xxSuccessful() || httpStatus.is3xxRedirection();
 	}
 
 	private Span getSpanFromAttribute(HttpServletRequest request) {
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 48e5a4b60..098cd93b1 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
@@ -140,7 +140,9 @@ public class DefaultTracer implements Tracer {
 			}
 			SpanContextHolder.close(new SpanContextHolder.SpanFunction() {
 				@Override public void apply(Span span) {
-					DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
+					if (span!=null) {
+						DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
+					}
 				}
 			});
 		}