diff --git a/mcp-client-typescript/index.ts b/mcp-client-typescript/index.ts
index be89f65..222c416 100644
--- a/mcp-client-typescript/index.ts
+++ b/mcp-client-typescript/index.ts
@@ -184,6 +184,10 @@ async function main() {
   try {
     await mcpClient.connectToServer(process.argv[2]);
     await mcpClient.chatLoop();
+  } catch (e) {
+    console.error("Error:", e);
+    await mcpClient.cleanup();
+    process.exit(1);
   } finally {
     await mcpClient.cleanup();
     process.exit(0);