diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index 5adcba2..aa9a4b4 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -38,19 +38,25 @@ export default function LoginPage() {
     setLoading(true);
     try {
       if (username.includes("@")) {
-        await authClient.signIn.email({
+        const { error } = await authClient.signIn.email({
           email: username,
           password: password,
         });
+        if (error) {
+          toast.error(error.message ?? t("loginFailed"));
+          return;
+        }
       } else {
-        await authClient.signIn.username({
+        const { error } = await authClient.signIn.username({
           username: username,
           password: password,
         });
+        if (error) {
+          toast.error(error.message ?? t("loginFailed"));
+          return;
+        }
       }
       router.push(redirectTo ?? "/folders");
-    } catch (error) {
-      toast.error(t("loginFailed"));
     } finally {
       setLoading(false);
     }
diff --git a/src/app/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx
index 4e29624..9f0f470 100644
--- a/src/app/(auth)/signup/page.tsx
+++ b/src/app/(auth)/signup/page.tsx
@@ -39,15 +39,17 @@ export default function SignUpPage() {
 
     setLoading(true);
     try {
-      await authClient.signUp.email({
+      const { error } = await authClient.signUp.email({
         email: email,
         name: username,
         username: username,
         password: password,
       });
+      if (error) {
+        toast.error(error.message ?? t("signUpFailed"));
+        return;
+      }
       router.push(redirectTo ?? "/folders");
-    } catch (error) {
-      toast.error(t("signUpFailed"));
     } finally {
       setLoading(false);
     }