diff --git a/src/pages/api/users.ts b/src/pages/api/users.ts
index 5788753..5b0becb 100644
--- a/src/pages/api/users.ts
+++ b/src/pages/api/users.ts
@@ -1,7 +1,15 @@
-import { NextApiResponse } from 'next';
+import type { NextApiRequest, NextApiResponse } from 'next';
 import { prisma } from '../../../utils/prisma';
 
-export default async function handler(req, res: NextApiResponse) {
-  const users = await prisma.user.findMany();
-  res.status(200).json(users);
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
+  try {
+    const users = await prisma.user.findMany();
+    res.status(200).json(users);
+  } catch (error) {
+    console.error('Error fetching users:', error);
+    res.status(500).json({ error: 'Internal server error' });
+  }
 }
diff --git a/src/pages/api/users/[id].ts b/src/pages/api/users/[id].ts
index e23dcc4..17f2344 100644
--- a/src/pages/api/users/[id].ts
+++ b/src/pages/api/users/[id].ts
@@ -5,14 +5,14 @@ export default async function handler(
   req: NextApiRequest,
   res: NextApiResponse
 ) {
-  if (req.method === 'GET') {
-    const params = req.query;
-    const getAbsences = params.getAbsences === 'true';
-    const id = Number(params.id as string);
+  const id = Number(req.query.id);
 
-    if (Number.isNaN(id)) {
-      return res.status(400).json({ error: 'Invalid ID provided' });
-    }
+  if (Number.isNaN(id)) {
+    return res.status(400).json({ error: 'Invalid ID provided' });
+  }
+
+  if (req.method === 'GET') {
+    const getAbsences = req.query.getAbsences === 'true';
 
     try {
       const user = await prisma.user.findUnique({
@@ -21,15 +21,16 @@ export default async function handler(
       });
 
       if (!user) {
-        return res.status(400).json({ error: 'User not found' });
+        return res.status(404).json({ error: 'User not found' });
       }
 
       return res.status(200).json(user);
-    } catch {
+    } catch (error) {
+      console.error('Error fetching user:', error);
       return res.status(500).json({ error: 'Internal server error' });
     }
   } else if (req.method === 'PATCH') {
-    const data = req.body;
+    const { email, firstName, lastName, role, status } = req.body;
     const id = Number(req.query.id as string);
 
     if (Number.isNaN(id)) {
@@ -39,13 +40,7 @@ export default async function handler(
     try {
       const updatedUser = await prisma.user.update({
         where: { id },
-        data: {
-          email: data.email,
-          firstName: data.firstName,
-          lastName: data.lastName,
-          role: data.role,
-          status: data.status,
-        },
+        data: { email, firstName, lastName, role, status },
       });
 
       if (!updatedUser) {
@@ -53,7 +48,8 @@ export default async function handler(
       }
 
       return res.status(200).json(updatedUser);
-    } catch {
+    } catch (error) {
+      console.error('Error updating user:', error);
       return res.status(500).json({ error: 'Internal server error' });
     }
   } else {
diff --git a/src/pages/manage.tsx b/src/pages/manage.tsx
index 68b8d2d..3cb9f21 100644
--- a/src/pages/manage.tsx
+++ b/src/pages/manage.tsx
@@ -11,6 +11,7 @@ interface User {
 
 export default function AnotherPage() {
   const [users, setUsers] = useState<User[]>([]);
+  const [loading, setLoading] = useState<boolean>(true);
 
   useEffect(() => {
     const fetchUsers = async () => {
@@ -23,8 +24,12 @@ export default function AnotherPage() {
         }
         const data: User[] = await response.json();
         setUsers(data);
-      } catch (error) {
-        console.error('Error fetching users:', error);
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          console.error('Error fetching users:', error.message);
+        }
+      } finally {
+        setLoading(false);
       }
     };
 
@@ -33,15 +38,18 @@ export default function AnotherPage() {
 
   const updateUserRole = async (userId: number, newRole: string) => {
     const confirmed = window.confirm('Confirm change role to ' + newRole);
-
-    if (!confirmed) {
-      return;
-    }
+    if (!confirmed) return;
 
     const apiUrl = `/api/users/${userId}`;
+    const originalUsers = [...users];
+
+    setUsers((prevUsers) =>
+      prevUsers.map((user) =>
+        user.id === userId ? { ...user, role: newRole } : user
+      )
+    );
 
     try {
-      // update server side
       const response = await fetch(apiUrl, {
         method: 'PATCH',
         headers: {
@@ -51,24 +59,22 @@ export default function AnotherPage() {
       });
 
       if (!response.ok) {
+        setUsers(originalUsers);
         throw new Error(response.statusText);
       }
-
-      // update in frontend
-      setUsers(
-        users.map((user) =>
-          user.id === userId ? { ...user, role: newRole } : user
-        )
-      );
-    } catch (error) {
-      console.error('Error updating user:', error);
+    } catch (error: unknown) {
+      if (error instanceof Error) {
+        console.error('Error updating user:', error.message);
+      }
     }
   };
 
   return (
     <div>
       <h1>Admin Management</h1>
-      {users ? (
+      {loading ? (
+        <p>Loading...</p>
+      ) : (
         <table>
           <thead>
             <tr>
@@ -97,8 +103,6 @@ export default function AnotherPage() {
             ))}
           </tbody>
         </table>
-      ) : (
-        <p>Loading...</p>
       )}
     </div>
   );