From 6862e1f433abdf55852c87ca59669ce5ecd8b28c Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Wed, 9 Oct 2024 13:10:20 +0300
Subject: [PATCH] fix: return null on no orgId

---
 .../better-auth/src/plugins/organization/routes/crud-org.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/better-auth/src/plugins/organization/routes/crud-org.ts b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
index 6acf0cd4a9..6b5777d1f6 100644
--- a/packages/better-auth/src/plugins/organization/routes/crud-org.ts
+++ b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
@@ -228,8 +228,8 @@ export const getFullOrganization = createAuthEndpoint(
 		const session = ctx.context.session;
 		const orgId = ctx.query.orgId || session.session.activeOrganizationId;
 		if (!orgId) {
-			throw new APIError("BAD_REQUEST", {
-				message: "Organization not found",
+			return ctx.json(null, {
+				status: 400,
 			});
 		}
 		const adapter = getOrgAdapter(ctx.context.adapter, ctx.context.orgOptions);