diff --git a/rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/ConsumerServiceImpl.java b/rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/ConsumerServiceImpl.java
index 715cbf5..87ddb06 100644
--- a/rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/ConsumerServiceImpl.java
+++ b/rocketmq-console/src/main/java/org/apache/rocketmq/console/service/impl/ConsumerServiceImpl.java
@@ -95,7 +95,7 @@
                 consumeStats = mqAdminExt.examineConsumeStats(consumerGroup);
             }
             catch (Exception e) {
-                logger.warn("examineConsumeStats exception, " + consumerGroup, e);
+                logger.warn("examineConsumeStats exception to consumerGroup {}, response [{}]", consumerGroup, e.getMessage());
             }
 
             ConsumerConnection consumerConnection = null;
@@ -103,7 +103,7 @@
                 consumerConnection = mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
             }
             catch (Exception e) {
-                logger.warn("examineConsumerConnectionInfo exception, " + consumerGroup, e);
+                logger.warn("examineConsumeStats exception to consumerGroup {}, response [{}]", consumerGroup, e.getMessage());
             }
 
             groupConsumeInfo.setGroup(consumerGroup);
