diff --git a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
index 2d934a97df..2fe26e464b 100644
--- a/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/util/DebugServlet.java
@@ -229,9 +229,13 @@ public class DebugServlet extends HttpServlet
       printHeader(writer);
       appendContextAttributes(writer);
 
-      HttpSession session = request.getSession();
+      HttpSession session = request.getSession(false);
+
+      if (session != null)
+      {
+        appendSessionAttributes(writer, session);
+      }
 
-      appendSessionAttributes(writer, session);
       printFooter(writer);
     }
     finally