diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
index 7a12acd47edf9..ea8eb6e8cc081 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MultiTopicsConsumerTest.java
@@ -413,8 +413,9 @@ public void testSubscriptionNotFound() throws PulsarAdminException, PulsarClient
                     .isAckReceiptEnabled(true)
                     .subscribe();
             assertTrue(singleTopicConsumer instanceof ConsumerImpl);
+        } catch (PulsarClientException.SubscriptionNotFoundException ignore) {
         } catch (Throwable t) {
-            assertTrue(t.getCause().getCause() instanceof PulsarClientException.SubscriptionNotFoundException);
+            fail("Should throw PulsarClientException.SubscriptionNotFoundException instead");
         }
 
         try {
@@ -424,8 +425,9 @@ public void testSubscriptionNotFound() throws PulsarAdminException, PulsarClient
                     .isAckReceiptEnabled(true)
                     .subscribe();
             assertTrue(multiTopicsConsumer instanceof MultiTopicsConsumerImpl);
+        } catch (PulsarClientException.SubscriptionNotFoundException ignore) {
         } catch (Throwable t) {
-            assertTrue(t.getCause().getCause() instanceof PulsarClientException.SubscriptionNotFoundException);
+            fail("Should throw PulsarClientException.SubscriptionNotFoundException instead");
         }
 
         pulsar.getConfiguration().setAllowAutoSubscriptionCreation(true);
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
index 9eb6c612a52a2..b2c9b2b697b42 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
@@ -1113,6 +1113,8 @@ public static PulsarClientException unwrap(Throwable t) {
             newException = new TransactionConflictException(msg);
         } else if (cause instanceof TopicDoesNotExistException) {
             newException = new TopicDoesNotExistException(msg);
+        } else if (cause instanceof SubscriptionNotFoundException) {
+            newException = new SubscriptionNotFoundException(msg);
         } else if (cause instanceof ProducerFencedException) {
             newException = new ProducerFencedException(msg);
         } else if (cause instanceof MemoryBufferIsFullError) {