diff --git a/servlet/src/main/java/io/undertow/servlet/attribute/ServletNameAttribute.java b/servlet/src/main/java/io/undertow/servlet/attribute/ServletNameAttribute.java
index b7c4ba4ee5..b392561170 100644
--- a/servlet/src/main/java/io/undertow/servlet/attribute/ServletNameAttribute.java
+++ b/servlet/src/main/java/io/undertow/servlet/attribute/ServletNameAttribute.java
@@ -35,6 +35,7 @@ public class ServletNameAttribute implements ExchangeAttribute {
 
     public static final ExchangeAttribute INSTANCE = new ServletNameAttribute();
     public static final String NAME = "Servlet Name";
+    public static final String UNDEFINED = "No-Servlet";
 
     private ServletNameAttribute() {
 
@@ -43,7 +44,11 @@ private ServletNameAttribute() {
     @Override
     public String readAttribute(final HttpServerExchange exchange) {
         ServletRequestContext src = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);
-        return src.getCurrentServlet().getManagedServlet().getServletInfo().getName();
+        if (src != null) {
+            return src.getCurrentServlet().getManagedServlet().getServletInfo().getName();
+        } else {
+            return UNDEFINED;
+        }
     }
 
     @Override