1 files changed, 4 insertions, 2 deletions

diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
index a52659ff..76b530b4 100644
--- a/src/daemon/connection_https.c
+++ b/src/daemon/connection_https.c
@@ -52,15 +52,17 @@ const union MHD_ConnectionInfo *
 MHD_get_connection_info (struct MHD_Connection *connection,
                          enum MHD_ConnectionInfoType infoType, ...)
 {
-  if (connection->tls_session == NULL)
-    return NULL;
   switch (infoType)
     {
 #if HTTPS_SUPPORT
     case MHD_CONNECTION_INFO_CIPHER_ALGO:
+      if (connection->tls_session == NULL)
+        return NULL;
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.read_bulk_cipher_algorithm;
     case MHD_CONNECTION_INFO_PROTOCOL:
+      if (connection->tls_session == NULL)
+        return NULL;
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.version;
 #endif