diff --git a/apps/web/pages/api/auth/signup.ts b/apps/web/pages/api/auth/signup.ts
index e8f13bf166..77036fb933 100644
--- a/apps/web/pages/api/auth/signup.ts
+++ b/apps/web/pages/api/auth/signup.ts
@@ -37,8 +37,12 @@ export default async function handler(req: RequestWithUsernameStatus, res: NextA
     return selfhostedSignupHandler(req, res);
   } catch (e) {
     if (e instanceof HttpError) {
-      return res.status(e.statusCode).json({ message: e.message });
+      console.log("HTTPERROR");
+      res.status(e.statusCode).json({ message: e.message });
     }
-    throw e;
+    console.log("INTERNAL SERVER ERROR");
+    res.status(500).json({ message: "Internal server error" });
+  } finally {
+    console.log("FINALLY - we have a log");
   }
 }
diff --git a/packages/features/auth/signup/handlers/calcomHandler.ts b/packages/features/auth/signup/handlers/calcomHandler.ts
index 476557a754..19ff4cec7b 100644
--- a/packages/features/auth/signup/handlers/calcomHandler.ts
+++ b/packages/features/auth/signup/handlers/calcomHandler.ts
@@ -54,9 +54,12 @@ async function handler(req: RequestWithUsernameStatus, res: NextApiResponse) {
     throwIfTokenExpired(foundToken?.expires);
     validateUsernameForTeam({ username, email, teamId: foundToken?.teamId });
   } else {
-    const userValidation = await validateUsername(username, email);
-    if (!userValidation.isValid) {
-      return res.status(409).json({ message: "Username or email is already taken" });
+    const usernameAndEmailValidation = await validateUsername(username, email);
+    if (!usernameAndEmailValidation.isValid) {
+      throw new HttpError({
+        statusCode: 409,
+        message: "Username or email is already taken",
+      });
     }
   }