diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/src/main/java/org/xwiki/container/servlet/HttpServletUtils.java b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/src/main/java/org/xwiki/container/servlet/HttpServletUtils.java
index fb7e4fb937854543a73a3bb229aa2b8c4321a3cd..e80ce49627a67160ff5154e3244ead94f78ab0a0 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/src/main/java/org/xwiki/container/servlet/HttpServletUtils.java
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/src/main/java/org/xwiki/container/servlet/HttpServletUtils.java
@@ -193,8 +193,9 @@ private static void appendHostPort(HttpServletRequest request, StringBuilder bui
 
         // Ask the application server (we don't start with that because it's very often wrong or badly configured
         // behind an HTTP proxy...)
-        String requestURLString = request.getRequestURL().toString();
-        if (!requestURLString.isEmpty()) {
+        StringBuffer buffer = request.getRequestURL();
+        if (buffer != null && !buffer.isEmpty()) {
+            String requestURLString = buffer.toString();
             try {
                 URL requestURL = new URL(requestURLString);
                 builder.append(requestURL.getHost());