diff --git a/backend/app/api/routes/credentials.py b/backend/app/api/routes/credentials.py
index 73bd2129..32f9afcc 100644
--- a/backend/app/api/routes/credentials.py
+++ b/backend/app/api/routes/credentials.py
@@ -1,86 +1,127 @@
-from typing import Any, List
-
 from fastapi import APIRouter, Depends, HTTPException
-from sqlalchemy import func
-from sqlmodel import Session, select
 
-from app.models import Creds, CredsCreate, CredsUpdate, CredsPublic
 from app.api.deps import (
-    CurrentUser,
     SessionDep,
     get_current_active_superuser,
 )
-from app.crud.credentials import set_creds_for_org, get_key_by_org, remove_creds_for_org, get_creds_by_org, update_creds_for_org
-from app.utils import APIResponse 
+from app.crud.credentials import (
+    get_creds_by_org,
+    get_key_by_org,
+    remove_creds_for_org,
+    set_creds_for_org,
+)
+from app.models import CredsCreate, CredsPublic, CredsUpdate
+from app.utils import APIResponse
 
 router = APIRouter(prefix="/credentials", tags=["credentials"])
 
-@router.post("/", dependencies=[Depends(get_current_active_superuser)], response_model=APIResponse[CredsPublic])
+
+@router.post(
+    "/",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[CredsPublic],
+)
 def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
+    new_creds = None
     try:
-        existing_creds = get_creds_by_org(session=session, org_id=creds_in.organization_id)
-
-        if existing_creds:
-            raise HTTPException(status_code=400, detail="Credentials for this organization already exist.")
-        
-        new_creds = set_creds_for_org(session=session, creds_add=creds_in)
-        return APIResponse.success_response(new_creds)
-    
-    except HTTPException as http_error:
-        raise http_error
-    
+        existing_creds = get_creds_by_org(
+            session=session,
+            org_id=creds_in.organization_id
+        )
+        if not existing_creds:
+            new_creds = set_creds_for_org(session=session, creds_add=creds_in)
     except Exception as e:
-        raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"An unexpected error occurred: {str(e)}"
+        )
+
+    if new_creds is None:
+        raise HTTPException(
+            status_code=400, detail="Credentials for this organization already exist."
+        )
+
+    return APIResponse.success_response(new_creds)
 
 
-@router.get("/{org_id}", dependencies=[Depends(get_current_active_superuser)], response_model=APIResponse[CredsPublic])
+@router.get(
+    "/{org_id}",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[CredsPublic],
+)
 def read_credential(*, session: SessionDep, org_id: int):
     try:
         creds = get_creds_by_org(session=session, org_id=org_id)
-        if creds is None:
-            raise HTTPException(status_code=404, detail="Credentials not found")
-        return APIResponse.success_response(creds)
-    except HTTPException as http_error:
-        raise http_error
     except Exception as e:
-        raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
+        # Catch any other exceptions and return an internal server error response
+        raise HTTPException(
+            status_code=500,
+            detail=f"An unexpected error occurred: {str(e)}"
+        )
+
+    if creds is None:
+        raise HTTPException(status_code=404, detail="Credentials not found")
+
+    return APIResponse.success_response(creds)
 
-@router.get("/{org_id}/api-key", dependencies=[Depends(get_current_active_superuser)], response_model=APIResponse[dict])
+
+@router.get(
+    "/{org_id}/api-key",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[str],
+)
 def read_api_key(*, session: SessionDep, org_id: int):
     try:
         api_key = get_key_by_org(session=session, org_id=org_id)
-        if api_key is None:
-            raise HTTPException(status_code=404, detail="API key not found")
-        
-        return APIResponse.success_response({"api_key": api_key})
-    
-    except HTTPException as http_error:
-        raise http_error
     except Exception as e:
-        raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
-    
-@router.patch("/{org_id}", dependencies=[Depends(get_current_active_superuser)], response_model=APIResponse[CredsPublic])
+        # Catch any other exceptions and return an internal server error response
+        raise HTTPException(
+            status_code=500,
+            detail=f"An unexpected error occurred: {str(e)}"
+        )
+
+    if api_key is None:
+        raise HTTPException(status_code=404, detail="API key not found")
+
+    return APIResponse.success_response(api_key)
+
+
+@router.patch(
+    "/{org_id}",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[CredsPublic],
+)
 def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate):
     try:
-        updated_creds = update_creds_for_org(session=session, org_id=org_id, creds_in=creds_in)
-        return APIResponse.success_response(updated_creds)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail=str(e))
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
+        creds_data = creds_in.dict(exclude_unset=True)
+        creds = creds.model_copy(update=creds_data)
+        session.add(creds)
+        session.commit()
+        session.flush(creds)
+    except Exception:
+        session.rollback()
+        raise HTTPException(status_code=500, detail="Failed to update credentials")
+
+    return APIResponse.success_response(creds)
 
 
-@router.delete("/{org_id}/api-key", dependencies=[Depends(get_current_active_superuser)], response_model=APIResponse[dict])
+@router.delete(
+    "/{org_id}/api-key",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[None],
+)
 def delete_credential(*, session: SessionDep, org_id: int):
     try:
         creds = remove_creds_for_org(session=session, org_id=org_id)
-        
-        if creds is None:
-            raise HTTPException(status_code=404, detail="Credentials not found")
-        
-        return APIResponse.success_response({"message": "Credentials deleted successfully"})
-    
-    except HTTPException as http_error:
-        raise http_error
     except Exception as e:
-        raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
\ No newline at end of file
+        raise HTTPException(
+            status_code=500,
+            detail=f"An unexpected error occurred: {str(e)}"
+        )
+
+    if creds is None:
+        raise HTTPException(
+            status_code=404,
+            detail="API key for organization not found"
+        )
+
+    return APIResponse.success_response(None)