2 files changed, 4 insertions, 3 deletions

diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 88ee41096..53c0f2e47 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -419,9 +419,10 @@ channel_incoming (void *cls,
   }
   if (NULL != lp) {
     /* Now that we have our circuit up and running, let's not
-     * get confused by further incoming circuits.
+     * get confused by further incoming connect requests.
      */
     GNUNET_CADET_close_port (lp);
+    lp = NULL;
   }
   ch = channel;
   if (GNUNET_NO == echo)
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index a80081011..ecbe69443 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -256,9 +256,9 @@ get_type (const char *log)
   if (0 == strcasecmp (log, _("DEBUG")))
     return GNUNET_ERROR_TYPE_DEBUG;
   if (0 == strcasecmp (log, _("INFO")))
-    return GNUNET_ERROR_TYPE_MESSAGE;
-  if (0 == strcasecmp (log, _("MESSAGE")))
     return GNUNET_ERROR_TYPE_INFO;
+  if (0 == strcasecmp (log, _("MESSAGE")))
+    return GNUNET_ERROR_TYPE_MESSAGE;
   if (0 == strcasecmp (log, _("WARNING")))
     return GNUNET_ERROR_TYPE_WARNING;
   if (0 == strcasecmp (log, _("ERROR")))