diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPIExt.java b/client/src/main/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPIExt.java
index 9089503407..7442e89cca 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPIExt.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPIExt.java
@@ -429,14 +429,12 @@ public class MQClientAPIExt extends MQClientAPIImpl {
                 return;
             }
             switch (response.getCode()) {
-                case ResponseCode.SUCCESS: {
+                case ResponseCode.SUCCESS:
                     future.complete(null);
-                }
-                case ResponseCode.SYSTEM_ERROR:
-                case ResponseCode.SUBSCRIPTION_GROUP_NOT_EXIST:
-                case ResponseCode.TOPIC_NOT_EXIST: {
-                    future.completeExceptionally(new MQBrokerException(response.getCode(), response.getRemark()));
-                }
+                    break;
+                default:
+                    future.completeExceptionally(new MQBrokerException(response.getCode(), response.getRemark(), brokerAddr));
+                    break;
             }
         });
         return future;