From 20d15b2075437b055adf6080ca57dac5ad61deb4 Mon Sep 17 00:00:00 2001
From: Jithmi004 <jithmi.nawoda01@gmail.com>
Date: Thu, 27 Mar 2025 10:08:50 +0530
Subject: [PATCH] Fix null pointer exception when the tenant is invalid

---
 .../main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
index e8662c256c6f..670e797c4368 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -2585,6 +2585,10 @@ public static boolean isUserExist(String username) throws APIManagementException
         try {
             int tenantId =
                     ServiceReferenceHolder.getInstance().getRealmService().getTenantManager().getTenantId(tenantDomain);
+            if (tenantId == -1) {
+                throw new APIManagementException("Tenant " + tenantDomain + " not found.",
+                        ExceptionCodes.INVALID_TENANT);
+            }
             UserStoreManager manager =
                     ServiceReferenceHolder.getInstance().getRealmService().getTenantUserRealm(tenantId)
                             .getUserStoreManager();