diff --git a/src/airflow_mcp_server/server.py b/src/airflow_mcp_server/server.py
deleted file mode 100644
index 4e5103a..0000000
--- a/src/airflow_mcp_server/server.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import logging
-from typing import Any
-
-from mcp.server import Server
-from mcp.server.stdio import stdio_server
-from mcp.types import Prompt, Resource, ResourceTemplate, TextContent, Tool
-
-from airflow_mcp_server.config import AirflowConfig
-from airflow_mcp_server.tools.tool_manager import get_airflow_tools, get_tool
-
-# ===========THIS IS FOR DEBUGGING WITH MCP INSPECTOR===================
-# import sys
-# Configure root logger to stderr
-# logging.basicConfig(level=logging.DEBUG, format="%(asctime)s [%(levelname)s] %(message)s", handlers=[logging.StreamHandler(sys.stderr)])
-
-# Disable Uvicorn's default handlers
-# logging.getLogger("uvicorn.error").handlers = []
-# logging.getLogger("uvicorn.access").handlers = []
-# ======================================================================
-logger = logging.getLogger(__name__)
-
-
-async def serve(config: AirflowConfig) -> None:
-    """Start MCP server.
-
-    Args:
-        config: Configuration object with auth and URL settings
-    """
-    server = Server("airflow-mcp-server")
-
-    @server.list_tools()
-    async def list_tools() -> list[Tool]:
-        try:
-            return await get_airflow_tools(config)
-        except Exception as e:
-            logger.error("Failed to list tools: %s", e)
-            raise
-
-    @server.list_resources()
-    async def list_resources() -> list[Resource]:
-        """List available resources (returns empty list)."""
-        logger.info("Resources list requested - returning empty list")
-        return []
-
-    @server.list_resource_templates()
-    async def list_resource_templates() -> list[ResourceTemplate]:
-        """List available resource templates (returns empty list)."""
-        logger.info("Resource templates list requested - returning empty list")
-        return []
-
-    @server.list_prompts()
-    async def list_prompts() -> list[Prompt]:
-        """List available prompts (returns empty list)."""
-        logger.info("Prompts list requested - returning empty list")
-        return []
-
-    @server.call_tool()
-    async def call_tool(name: str, arguments: dict[str, Any]) -> list[TextContent]:
-        try:
-            tool = await get_tool(config, name)
-            async with tool.client:
-                result = await tool.run(body=arguments)
-            return [TextContent(type="text", text=str(result))]
-        except Exception as e:
-            logger.error("Tool execution failed: %s", e)
-            raise
-
-    options = server.create_initialization_options()
-    async with stdio_server() as (read_stream, write_stream):
-        await server.run(read_stream, write_stream, options, raise_exceptions=True)
diff --git a/src/airflow_mcp_server/server_safe.py b/src/airflow_mcp_server/server_safe.py
index 5870073..6fe5ed4 100644
--- a/src/airflow_mcp_server/server_safe.py
+++ b/src/airflow_mcp_server/server_safe.py
@@ -1,6 +1,7 @@
 import logging
 from typing import Any
 
+import anyio
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import Prompt, Resource, ResourceTemplate, TextContent, Tool
@@ -60,4 +61,10 @@ async def serve(config: AirflowConfig) -> None:
 
     options = server.create_initialization_options()
     async with stdio_server() as (read_stream, write_stream):
-        await server.run(read_stream, write_stream, options, raise_exceptions=True)
+        try:
+            await server.run(read_stream, write_stream, options, raise_exceptions=True)
+        except anyio.BrokenResourceError:
+            logger.error("BrokenResourceError: Stream was closed unexpectedly. Exiting gracefully.")
+        except Exception as e:
+            logger.error(f"Unexpected error in server.run: {e}")
+            raise
diff --git a/src/airflow_mcp_server/server_unsafe.py b/src/airflow_mcp_server/server_unsafe.py
index 2299206..65e97b0 100644
--- a/src/airflow_mcp_server/server_unsafe.py
+++ b/src/airflow_mcp_server/server_unsafe.py
@@ -1,6 +1,7 @@
 import logging
 from typing import Any
 
+import anyio
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import Prompt, Resource, ResourceTemplate, TextContent, Tool
@@ -8,6 +9,15 @@ from mcp.types import Prompt, Resource, ResourceTemplate, TextContent, Tool
 from airflow_mcp_server.config import AirflowConfig
 from airflow_mcp_server.tools.tool_manager import get_airflow_tools, get_tool
 
+# ===========THIS IS FOR DEBUGGING WITH MCP INSPECTOR===================
+# import sys
+# Configure root logger to stderr
+# logging.basicConfig(level=logging.DEBUG, format="%(asctime)s [%(levelname)s] %(message)s", handlers=[logging.StreamHandler(sys.stderr)])
+
+# Disable Uvicorn's default handlers
+# logging.getLogger("uvicorn.error").handlers = []
+# logging.getLogger("uvicorn.access").handlers = []
+# ======================================================================
 logger = logging.getLogger(__name__)
 
 
@@ -58,4 +68,10 @@ async def serve(config: AirflowConfig) -> None:
 
     options = server.create_initialization_options()
     async with stdio_server() as (read_stream, write_stream):
-        await server.run(read_stream, write_stream, options, raise_exceptions=True)
+        try:
+            await server.run(read_stream, write_stream, options, raise_exceptions=True)
+        except anyio.BrokenResourceError:
+            logger.error("BrokenResourceError: Stream was closed unexpectedly. Exiting gracefully.")
+        except Exception as e:
+            logger.error(f"Unexpected error in server.run: {e}")
+            raise