diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java
index 8b4d5b6f9..78d2cfc08 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java
@@ -308,6 +308,9 @@ public final class TraceWebFilter implements WebFilter, Ordered {
 			}
 
 			private void addClassNameTag(Object handler, Span span) {
+				if (handler == null) {
+					return;
+				}
 				String className;
 				if (handler instanceof HandlerMethod) {
 					className = ((HandlerMethod) handler).getBeanType().getSimpleName();