diff --git a/api/main.py b/api/main.py
index d0b8c79..62ba6a6 100644
--- a/api/main.py
+++ b/api/main.py
@@ -1,7 +1,79 @@
+import uuid
+from starlette.middleware.base import BaseHTTPMiddleware
 from fastapi import FastAPI
 from api.routes import templates, forms
+from fastapi import Request
+from fastapi.responses import JSONResponse
+from fastapi.exceptions import RequestValidationError
+from starlette.exceptions import HTTPException as StarletteHTTPException
 
 app = FastAPI()
 
+class RequestIDMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        request_id = str(uuid.uuid4())
+        request.state.request_id = request_id
+        response = await call_next(request)
+        response.headers["X-Request-ID"] = request_id
+        return response
+
+
+app.add_middleware(RequestIDMiddleware)
+
+
+@app.exception_handler(StarletteHTTPException)
+async def http_exception_handler(request: Request, exc: StarletteHTTPException):
+    return JSONResponse(
+        status_code=exc.status_code,
+        content={
+            "error": {
+                "type": "HTTPException",
+                "message": exc.detail,
+                "details": {}
+            }
+        },
+    )
+
+@app.exception_handler(RequestValidationError)
+async def validation_exception_handler(request: Request, exc: RequestValidationError):
+    formatted_errors = []
+
+    for err in exc.errors():
+        loc = err.get("loc", [])
+        field = loc[-1] if loc else "unknown"  
+        issue = err.get("msg", "Invalid value")
+        expected = err.get("type", "")
+
+        formatted_errors.append({
+            "field": field,
+            "issue": issue,
+            "expected": expected
+        })
+
+    return JSONResponse(
+        status_code=422,
+        content={
+            "error": {
+                "type": "ValidationError",
+                "message": "Invalid request data",
+                "details": formatted_errors,
+            }
+        },
+    )
+
+@app.exception_handler(Exception)
+async def general_exception_handler(request: Request, exc: Exception):
+    return JSONResponse(
+        status_code=500,
+        content={
+            "error": {
+                "type": "InternalServerError",
+                "message": str(exc),
+                "details": {}
+            }
+        },
+    )
+
+
 app.include_router(templates.router)
 app.include_router(forms.router)
\ No newline at end of file
diff --git a/api/routes/forms.py b/api/routes/forms.py
index f3430ed..5e18013 100644
--- a/api/routes/forms.py
+++ b/api/routes/forms.py
@@ -11,14 +11,15 @@
 
 @router.post("/fill", response_model=FormFillResponse)
 def fill_form(form: FormFill, db: Session = Depends(get_db)):
-    if not get_template(db, form.template_id):
-        raise AppError("Template not found", status_code=404)
-
     fetched_template = get_template(db, form.template_id)
-
+    if not fetched_template:
+        raise AppError("Template not found", status_code=404)
     controller = Controller()
-    path = controller.fill_form(user_input=form.input_text, fields=fetched_template.fields, pdf_form_path=fetched_template.pdf_path)
-
+    path = controller.fill_form(
+        user_input=form.input_text,
+        fields=fetched_template.fields,
+        pdf_form_path=fetched_template.pdf_path
+    )
     submission = FormSubmission(**form.model_dump(), output_pdf_path=path)
     return create_form(db, submission)
 
diff --git a/api/schemas/forms.py b/api/schemas/forms.py
index 3cce650..bf6957e 100644
--- a/api/schemas/forms.py
+++ b/api/schemas/forms.py
@@ -1,9 +1,15 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
 class FormFill(BaseModel):
     template_id: int
     input_text: str
 
+    @field_validator("input_text")
+    def validate_input_text(cls, value):
+        if not value or not value.strip():
+            raise ValueError("Input text cannot be empty")
+        return value
+
 
 class FormFillResponse(BaseModel):
     id: int