diff --git a/src/connmgr.c b/src/connmgr.c
index 8eb0d8365..fb242705a 100644
--- a/src/connmgr.c
+++ b/src/connmgr.c
@@ -31,6 +31,7 @@ typedef struct connmgr_cinfo_st {
 
 static void on_idle_timeout(lcb_timer_t tm, lcb_t instance, const void *cookie);
 static void he_available_notify(lcb_timer_t tm, lcb_t i, const void *cookie);
+static void he_dump(connmgr_hostent *he, FILE *out);
 
 static void destroy_cinfo(connmgr_cinfo *info)
 {
@@ -455,17 +456,10 @@ static void write_he_list(lcb_clist_t *ll, FILE *out)
 
 }
 
-static void dumpfunc(const void *k, lcb_size_t nk, const void *v, lcb_size_t nv,
-                     void *arg)
+static void he_dump(connmgr_hostent *he, FILE *out)
 {
-    FILE *out = (FILE *)arg;
-    connmgr_hostent *he = (connmgr_hostent *)v;
     lcb_list_t *llcur;
-
-    (void)nv;
-
-
-    fprintf(out, "HOST=%.*s ", (int)nk, (char *)k);
+    fprintf(out, "HOST=%s", he->key);
     fprintf(out, "Requests=%d, Idle=%d, Pending=%d, Leased=%d\n",
             (int)HE_NREQS(he),
             (int)HE_NIDLE(he),
@@ -496,6 +490,16 @@ static void dumpfunc(const void *k, lcb_size_t nk, const void *v, lcb_size_t nv,
     }
 
     fprintf(out, "\n");
+
+}
+
+static void dumpfunc(const void *k, lcb_size_t nk, const void *v, lcb_size_t nv,
+                     void *arg)
+{
+    FILE *out = (FILE *)arg;
+    connmgr_hostent *he = (connmgr_hostent *)v;
+    he_dump(he, out);
+    (void)nk;(void)k;(void)nv;
 }
 
 /**