diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index b17919f..de20132 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -59,7 +59,7 @@ export const actions = {
           status: 401,
         });
       } else {
-        return setError(form, 'password', (e as APIError).body.code as string);
+        return setError(form, 'password', (e as APIError).body.message as string);
       }
     }
 
diff --git a/src/routes/signup/+page.server.ts b/src/routes/signup/+page.server.ts
index 66f554f..a53f850 100644
--- a/src/routes/signup/+page.server.ts
+++ b/src/routes/signup/+page.server.ts
@@ -5,6 +5,7 @@ import { redirect } from '@sveltejs/kit';
 import { fail, message, setError, superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
 import type { Actions } from './$types';
+import type { APIError } from 'better-auth/api';
 
 export async function load({ request }) {
   const session = await auth.api.getSession({
@@ -26,36 +27,36 @@ export const actions = {
     const password = form.data.password;
     const name = form.data.username;
 
-    if (!form.valid) {
-      return fail(400, { form });
-    }
+    try {
+      if (!form.valid) {
+        return fail(400, { form });
+      }
 
-    const signup = await auth.api.signUpEmail({
-      body: {
-        name,
-        email,
-        password,
-      },
-      asResponse: true,
-    });
+      const signup = await auth.api.signUpEmail({
+        body: {
+          name,
+          email,
+          password,
+        },
+        asResponse: true,
+      });
 
-    const setCookieHeader = signup.headers.get('set-cookie');
-    if (setCookieHeader) {
-      const parsedCookie = setCookieHeader.split(';')[0];
-      const [name, encodedValue] = parsedCookie.split('=');
-      // need to decode it first
-      const decodedValue = decodeURIComponent(encodedValue);
-      cookies.set(name, decodedValue, {
-        path: '/',
-        httpOnly: true,
-        sameSite: 'lax',
-        maxAge: 604800,
-        secure: !dev,
-      });
-    } else {
-      return setError(form, 'verify', 'Invalid email or password', {
-        status: 401,
-      });
+      const setCookieHeader = signup.headers.get('set-cookie');
+      if (setCookieHeader) {
+        const parsedCookie = setCookieHeader.split(';')[0];
+        const [name, encodedValue] = parsedCookie.split('=');
+        // need to decode it first
+        const decodedValue = decodeURIComponent(encodedValue);
+        cookies.set(name, decodedValue, {
+          path: '/',
+          httpOnly: true,
+          sameSite: 'lax',
+          maxAge: 604800,
+          secure: !dev,
+        });
+      }
+    } catch (e) {
+      return setError(form, 'verify', (e as APIError).body.message as string);
     }
 
     return message(form, 'Successfuly signed in.');