diff --git a/api.py b/api.py
index 288e108..56d3154 100755
--- a/api.py
+++ b/api.py
@@ -278,8 +278,11 @@ async def process_query(request: QueryRequest):
         return JSONResponse(status_code=200, content=query_resp.jsonify())
     except Exception as e:
         logger.error(f"An error occurred: {str(e)}")
-        sys.exit(1)
+        query_resp.answer = f"An error occurred: {str(e)}"
+        query_resp.reasoning = f"Error: {str(e)}"
+        return JSONResponse(status_code=500, content=query_resp.jsonify())
     finally:
+        is_generating = False
         logger.info("Processing finished")
         if config.getboolean('MAIN', 'save_session'):
             interaction.save_session()
diff --git a/sources/agents/planner_agent.py b/sources/agents/planner_agent.py
index 0d1136f..ada8c07 100644
--- a/sources/agents/planner_agent.py
+++ b/sources/agents/planner_agent.py
@@ -271,8 +271,6 @@ class PlannerAgent(Agent):
         agents_tasks = []
         required_infos = None
         agents_work_result = dict()
-        answer = ""
-        self.stop = False
 
         self.status_message = "Making a plan..."
         agents_tasks = await self.make_plan(goal)