diff --git a/http/routing.hpp b/http/routing.hpp
index e39bfcc..b39442b 100644
--- a/http/routing.hpp
+++ b/http/routing.hpp
@@ -343,6 +343,7 @@
     void handleUpgrade(const Request& req, Response& /*res*/,
                        boost::asio::ip::tcp::socket&& adaptor) override
     {
+        BMCWEB_LOG_DEBUG << "Websocket handles upgrade";
         std::shared_ptr<
             crow::websocket::ConnectionImpl<boost::asio::ip::tcp::socket>>
             myConnection = std::make_shared<
@@ -356,6 +357,7 @@
                        boost::beast::ssl_stream<boost::asio::ip::tcp::socket>&&
                            adaptor) override
     {
+        BMCWEB_LOG_DEBUG << "Websocket handles upgrade";
         std::shared_ptr<crow::websocket::ConnectionImpl<
             boost::beast::ssl_stream<boost::asio::ip::tcp::socket>>>
             myConnection = std::make_shared<crow::websocket::ConnectionImpl<
diff --git a/http/websocket.hpp b/http/websocket.hpp
index 213c4c7..daa5100 100644
--- a/http/websocket.hpp
+++ b/http/websocket.hpp
@@ -76,7 +76,8 @@
             messageHandler,
         std::function<void(Connection&, const std::string&)> closeHandler,
         std::function<void(Connection&)> errorHandler) :
-        Connection(reqIn, reqIn.session->username),
+        Connection(reqIn, reqIn.session == nullptr ? std::string{}
+                                                   : reqIn.session->username),
         ws(std::move(adaptorIn)), inBuffer(inString, 131088),
         openHandler(std::move(openHandler)),
         messageHandler(std::move(messageHandler)),