diff --git a/store/main.py b/store/main.py
index 8ebef39..f1a1a4c 100644
--- a/store/main.py
+++ b/store/main.py
@@ -48,7 +48,9 @@ async def websocket_endpoint(websocket: WebSocket, user_id: int):
     try:
         # send already available data
         r = processed_agent_data.select().order_by(processed_agent_data.c.timestamp)
-        stored_data = SessionLocal().execute(r).fetchall()
+        session = SessionLocal()
+        stored_data = session.execute(r).fetchall()
+        session.close() 
 
         jsonable_data = [{c.name: getattr(i, c.name) for c in processed_agent_data.columns} for i in stored_data]
         for i in jsonable_data:
@@ -198,8 +200,12 @@ def update_processed_agent_data(processed_agent_data_id: int, data: ProcessedAge
         session.commit()
 
         updated_result = session.execute(query).fetchone()
-
         return ProcessedAgentDataInDB(**updated_result._mapping)
+        
+    except Exception as err:
+        session.rollback()
+        print(f"Database error: {err}")
+        raise HTTPException(status_code=500, detail="Internal Server Error")
 
     finally:
         session.close()
@@ -230,7 +236,12 @@ def delete_processed_agent_data(processed_agent_data_id: int):
         session.commit()
 
         return ProcessedAgentDataInDB(**result._mapping)
-
+        
+    except Exception as err:
+        session.rollback()
+        print(f"Database error: {err}")
+        raise HTTPException(status_code=500, detail="Internal Server Error")
+        
     finally:
         session.close()