diff --git a/frontend/src/components/chatbot/ChatInterface.tsx b/frontend/src/components/chatbot/ChatInterface.tsx
index fb65658..167a712 100644
--- a/frontend/src/components/chatbot/ChatInterface.tsx
+++ b/frontend/src/components/chatbot/ChatInterface.tsx
@@ -11,7 +11,7 @@ import { Separator } from "@/components/ui/separator"
 import { MessageCircle, Send, Bot, User, Loader2, Copy, ThumbsUp, ThumbsDown } from "lucide-react"
 import { useToast } from "@/hooks/use-toast"
 import { generateTimestampId } from "@/lib/id-utils"
-import { chatbotApi, type AppError } from "@/lib/api-client"
+import { chatbotApi } from "@/lib/api-client"
 import ReactMarkdown from "react-markdown"
 import remarkGfm from "remark-gfm"
 import rehypeHighlight from "rehype-highlight"
@@ -126,11 +126,10 @@ export function ChatInterface({ chatbotId, chatbotName, onClose }: ChatInterface
         content: msg.content
       }))
       
-      const data = await chatbotApi.sendMessage(
+      const data = await chatbotApi.chat(
         chatbotId,
         messageToSend,
-        conversationId || undefined,
-        conversationHistory
+        { conversation_id: conversationId || undefined }
       )
       
       // Update conversation ID if it's a new conversation
@@ -149,15 +148,36 @@ export function ChatInterface({ chatbotId, chatbotName, onClose }: ChatInterface
       setMessages(prev => [...prev, assistantMessage])
 
     } catch (error) {
-      const appError = error as AppError
-      
-      // More specific error handling
-      if (appError.code === 'UNAUTHORIZED') {
-        toast.error("Authentication Required", "Please log in to continue chatting.")
-      } else if (appError.code === 'NETWORK_ERROR') {
-        toast.error("Connection Error", "Please check your internet connection and try again.")
+      console.error('Chat error:', error)
+
+      // Handle different error types
+      if (error && typeof error === 'object') {
+        if ('response' in error) {
+          // Axios error
+          const status = error.response?.status
+          if (status === 401) {
+            toast.error("Authentication Required", "Please log in to continue chatting.")
+          } else if (status === 429) {
+            toast.error("Rate Limit", "Too many requests. Please wait and try again.")
+          } else {
+            toast.error("Message Failed", error.response?.data?.detail || "Failed to send message. Please try again.")
+          }
+        } else if ('code' in error) {
+          // Custom error with code
+          if (error.code === 'UNAUTHORIZED') {
+            toast.error("Authentication Required", "Please log in to continue chatting.")
+          } else if (error.code === 'NETWORK_ERROR') {
+            toast.error("Connection Error", "Please check your internet connection and try again.")
+          } else {
+            toast.error("Message Failed", error.message || "Failed to send message. Please try again.")
+          }
+        } else {
+          // Generic error
+          toast.error("Message Failed", error.message || "Failed to send message. Please try again.")
+        }
       } else {
-        toast.error("Message Failed", appError.message || "Failed to send message. Please try again.")
+        // Fallback for unknown error types
+        toast.error("Message Failed", "An unexpected error occurred. Please try again.")
       }
     } finally {
       setIsLoading(false)
diff --git a/frontend/src/hooks/use-chatbot-form.ts b/frontend/src/hooks/use-chatbot-form.ts
index 87d901d..5890451 100644
--- a/frontend/src/hooks/use-chatbot-form.ts
+++ b/frontend/src/hooks/use-chatbot-form.ts
@@ -4,7 +4,7 @@
 
 import { useState, useCallback, useMemo } from 'react'
 import { generateId } from '@/lib/id-utils'
-import { chatbotApi, type AppError } from '@/lib/api-client'
+import { chatbotApi } from '@/lib/api-client'
 import { useToast } from './use-toast'
 
 export interface ChatbotConfig {
@@ -59,10 +59,10 @@ export function useChatbotForm() {
   const loadChatbots = useCallback(async () => {
     setIsLoading(true)
     try {
-      const data = await chatbotApi.listChatbots()
+      const data = await chatbotApi.list()
       setChatbots(data)
     } catch (error) {
-      const appError = error as AppError
+      console.error('Load chatbots error:', error)
       toast.error("Loading Failed", "Failed to load chatbots")
     } finally {
       setIsLoading(false)
@@ -73,15 +73,20 @@ export function useChatbotForm() {
   const createChatbot = useCallback(async (config: ChatbotConfig) => {
     setIsSubmitting(true)
     try {
-      const newChatbot = await chatbotApi.createChatbot(config)
+      const newChatbot = await chatbotApi.create(config)
       setChatbots(prev => [...prev, newChatbot])
       toast.success("Success", `Chatbot "${config.name}" created successfully`)
       return newChatbot
     } catch (error) {
-      const appError = error as AppError
-      
-      if (appError.code === 'VALIDATION_ERROR') {
-        toast.error("Validation Error", appError.details || "Please check your input")
+      console.error('Create chatbot error:', error)
+
+      if (error && typeof error === 'object' && 'response' in error) {
+        const detail = error.response?.data?.detail || error.response?.data?.error
+        if (detail) {
+          toast.error("Validation Error", detail)
+        } else {
+          toast.error("Creation Failed", "Failed to create chatbot")
+        }
       } else {
         toast.error("Creation Failed", "Failed to create chatbot")
       }
@@ -95,12 +100,12 @@ export function useChatbotForm() {
   const updateChatbot = useCallback(async (id: string, config: ChatbotConfig) => {
     setIsSubmitting(true)
     try {
-      const updatedChatbot = await chatbotApi.updateChatbot(id, config)
+      const updatedChatbot = await chatbotApi.update(id, config)
       setChatbots(prev => prev.map(bot => bot.id === id ? updatedChatbot : bot))
       toast.success("Success", `Chatbot "${config.name}" updated successfully`)
       return updatedChatbot
     } catch (error) {
-      const appError = error as AppError
+      console.error('Update chatbot error:', error)
       toast.error("Update Failed", "Failed to update chatbot")
       throw error
     } finally {
@@ -112,11 +117,11 @@ export function useChatbotForm() {
   const deleteChatbot = useCallback(async (id: string) => {
     setIsSubmitting(true)
     try {
-      await chatbotApi.deleteChatbot(id)
+      await chatbotApi.delete(id)
       setChatbots(prev => prev.filter(bot => bot.id !== id))
       toast.success("Success", "Chatbot deleted successfully")
     } catch (error) {
-      const appError = error as AppError
+      console.error('Delete chatbot error:', error)
       toast.error("Deletion Failed", "Failed to delete chatbot")
       throw error
     } finally {
diff --git a/frontend/src/lib/api-client.ts b/frontend/src/lib/api-client.ts
index f08d5b2..1c03d16 100644
--- a/frontend/src/lib/api-client.ts
+++ b/frontend/src/lib/api-client.ts
@@ -106,5 +106,5 @@ export const chatbotApi = {
   update: async (id: string, data: any) => apiClient.put(`/api/chatbot/update/${id}`, data),
   delete: async (id: string) => apiClient.delete(`/api/chatbot/delete/${id}`),
   chat: async (id: string, message: string, config?: any) =>
-    apiClient.post(`/api/chatbot/chat`, { chatbot_id: id, message, ...config }),
+    apiClient.post(`/api/chatbot/chat/${id}`, { message, ...config }),
 };
\ No newline at end of file