diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index e6d636e..e070c43 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -281,9 +281,7 @@ static int accessHandlerCallback(void *cls,
 
     /* Retrieve the pattern to search */
     const char* pattern = MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "pattern");
-      if (pattern == NULL)
-	pattern = "";
-    std::string patternString = kiwix::urlDecode(string(pattern));
+    std::string patternString = kiwix::urlDecode(pattern == NULL ? "" : string(pattern));
     std::string patternCorrespondingUrl;
 
     /* Try first to load directly the article */