diff --git a/pyproject.toml b/pyproject.toml
index cbc28ba..9191062 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "uipath-mcp"
-version = "0.0.94"
+version = "0.0.95"
 description = "UiPath MCP SDK"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"
diff --git a/src/uipath_mcp/_cli/_runtime/_session.py b/src/uipath_mcp/_cli/_runtime/_session.py
index 6317a52..aedc748 100644
--- a/src/uipath_mcp/_cli/_runtime/_session.py
+++ b/src/uipath_mcp/_cli/_runtime/_session.py
@@ -5,7 +5,13 @@
 
 from mcp import StdioServerParameters, stdio_client
 from mcp.shared.message import SessionMessage
-from mcp.types import JSONRPCError, JSONRPCMessage, JSONRPCRequest, JSONRPCResponse
+from mcp.types import (
+    ErrorData,
+    JSONRPCError,
+    JSONRPCMessage,
+    JSONRPCRequest,
+    JSONRPCResponse,
+)
 from opentelemetry import trace
 from uipath import UiPath
 
@@ -31,7 +37,8 @@ def __init__(self, server_config: McpServer, session_id: str):
         self._run_task = None
         self._message_queue = asyncio.Queue()
         self._active_requests: Dict[str, str] = {}
-        self._last_request_id: None
+        self._last_request_id = None
+        self._last_message_id = None
         self._uipath = UiPath()
         self._mcp_tracer = McpTracer(tracer, logger)
         self._server_stderr_output: Optional[str] = None
@@ -122,11 +129,17 @@ async def _run_server(self, server_params: StdioServerParameters) -> None:
                             session_message = None
                             try:
                                 session_message = await self._read_stream.receive()
+                                if isinstance(session_message, Exception):
+                                    logger.error(f"Received error: {session_message}")
+                                    continue
                                 message = session_message.message
                                 # For responses, determine which request_id to use
                                 if self._is_response(message):
                                     message_id = self._get_message_id(message)
-                                    if message_id and message_id in self._active_requests:
+                                    if (
+                                        message_id
+                                        and message_id in self._active_requests
+                                    ):
                                         # Use the stored request_id for this response
                                         request_id = self._active_requests[message_id]
                                         # Send with the matched request_id
@@ -140,7 +153,9 @@ async def _run_server(self, server_params: StdioServerParameters) -> None:
                                         )
                                 else:
                                     # For non-responses, use the last known request_id
-                                    await self._send_message(message, self._last_request_id)
+                                    await self._send_message(
+                                        message, self._last_request_id
+                                    )
                             except Exception as e:
                                 if session_message:
                                     logger.info(session_message)
@@ -149,12 +164,20 @@ async def _run_server(self, server_params: StdioServerParameters) -> None:
                                     exc_info=True,
                                 )
                                 await self._send_message(
-                                    JSONRPCError(
-                                        code=-32000,
-                                        message=f"Error processing message: {session_message} {e} ",
+                                    JSONRPCMessage(
+                                        root=JSONRPCError(
+                                            jsonrpc="2.0",
+                                            # Use the last known message id for error reporting
+                                            id=self._last_message_id,
+                                            error=ErrorData(
+                                                code=-32000,
+                                                message=f"Error processing message: {e}",
+                                            ),
+                                        )
                                     ),
                                     self._last_request_id,
                                 )
+                                continue
                     finally:
                         # Cancel the consumer when we exit the loop
                         consumer_task.cancel()
@@ -267,6 +290,7 @@ async def _get_messages_internal(self, request_id: str) -> None:
                 if self._is_request(json_message):
                     message_id = self._get_message_id(json_message)
                     if message_id:
+                        self._last_message_id = message_id
                         self._active_requests[message_id] = request_id
                 with self._mcp_tracer.create_span_for_message(
                     json_message,