diff --git a/include/haproxy/bug.h b/include/haproxy/bug.h
index e708bcedf9..8183681abd 100644
--- a/include/haproxy/bug.h
+++ b/include/haproxy/bug.h
@@ -209,9 +209,11 @@ extern __attribute__((__weak__)) struct debug_count __stop_dbg_cnt  HA_SECTION_S
 			.func = __func__,					\
 			.line = _line,						\
 			.type = _type,						\
-			.desc = (sizeof("" __VA_ARGS__) > 1) ?			\
-				"\"" #_cond "\" [" __VA_ARGS__ "]" :		\
-				"\"" #_cond "\"",				\
+			.desc = (sizeof("" #_cond) > 1) ?			\
+				  (sizeof("" __VA_ARGS__) > 1) ?		\
+				  "\"" #_cond "\" [" __VA_ARGS__ "]" :		\
+				  "\"" #_cond "\"" :				\
+				"" __VA_ARGS__,					\
 			.count = 0,						\
 		};								\
 		HA_WEAK(__start_dbg_cnt);					\
diff --git a/src/debug.c b/src/debug.c
index 67d8ff9321..c4da8d7db6 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -2312,9 +2312,10 @@ static int debug_iohandler_counters(struct appctx *appctx)
 		}
 
 		if (ptr->type < DBG_COUNTER_TYPES)
-			chunk_appendf(&trash, "%-10u %3s %s:%d %s(): %s\n",
+			chunk_appendf(&trash, "%-10u %3s %s:%d %s()%s%s\n",
 				      ptr->count, bug_type[ptr->type],
-				      name, ptr->line, ptr->func, ptr->desc);
+				      name, ptr->line, ptr->func,
+				      *ptr->desc ? ": " : "", ptr->desc);
 
 		if (applet_putchk(appctx, &trash) == -1) {
 			ctx->start = ptr;