diff --git a/py/core/main/api/templates/log_viewer.html b/py/core/main/api/templates/log_viewer.html
index a3f9a6d5b..55ce6f68f 100644
--- a/py/core/main/api/templates/log_viewer.html
+++ b/py/core/main/api/templates/log_viewer.html
@@ -3,13 +3,13 @@
     <head>
         <title>R2R Log Viewer</title>
         <style>
-            body { 
-                margin: 20px; 
+            body {
+                margin: 20px;
                 font-family: monospace;
                 background: #f8f9fa;
             }
-            #logs { 
-                white-space: pre-wrap; 
+            #logs {
+                white-space: pre-wrap;
                 background: white;
                 padding: 20px;
                 border-radius: 4px;
@@ -31,38 +31,38 @@
     <body>
         <h2>R2R Log Viewer</h2>
         <div id="logs"><span class="status">Connecting to log stream...</span></div>
-        
+
         <!-- Include ansi_up via a CDN -->
         <script src="https://cdn.jsdelivr.net/npm/ansi_up@5.0.0/ansi_up.min.js"></script>
         <script>
             let ws = null;
             let ansi_up = new AnsiUp();
-            
+
             function connect() {
                 if (ws) {
                     ws.close();
                 }
-                
+
                 ws = new WebSocket(`ws://${window.location.host}/v3/logs/stream`);
-                
+
                 ws.onmessage = function(event) {
                     const logsDiv = document.getElementById("logs");
                     const newEntry = document.createElement('div');
                     newEntry.className = 'log-entry';
-                    
+
                     // Convert ANSI to HTML
                     const htmlContent = ansi_up.ansi_to_html(event.data);
                     newEntry.innerHTML = htmlContent;
                     logsDiv.appendChild(newEntry);
-                    
+
                     // Keep only the last 1000 entries
                     while (logsDiv.children.length > 1000) {
                         logsDiv.removeChild(logsDiv.firstChild);
                     }
-                    
+
                     logsDiv.scrollTop = logsDiv.scrollHeight;
                 };
-                
+
                 ws.onclose = function() {
                     const logsDiv = document.getElementById("logs");
                     const msg = document.createElement('div');
@@ -71,14 +71,14 @@ <h2>R2R Log Viewer</h2>
                     logsDiv.appendChild(msg);
                     setTimeout(connect, 1000);
                 };
-                
+
                 ws.onerror = function(err) {
                     console.error('WebSocket error:', err);
                 };
             }
-            
+
             connect();
-            
+
             window.onbeforeunload = function() {
                 if (ws) {
                     ws.close();
diff --git a/py/core/main/services/retrieval_service.py b/py/core/main/services/retrieval_service.py
index 3f9ef458d..4cd0afaad 100644
--- a/py/core/main/services/retrieval_service.py
+++ b/py/core/main/services/retrieval_service.py
@@ -302,32 +302,31 @@ async def agent(
                 ids = []
 
                 if conversation_id:
-                    # Fetch existing conversation
-                    conversation = (
-                        await self.logging_connection.get_conversation(
-                            conversation_id, branch_id
-                        )
-                    )
-                    if not conversation:
-                        logger.error(
-                            f"No conversation found for ID: {conversation_id}"
-                        )
-                        raise R2RException(
-                            status_code=404,
-                            message=f"Conversation not found: {conversation_id}",
+                    try:
+                        # Fetch existing conversation
+                        conversation = (
+                            await self.logging_connection.get_conversation(
+                                conversation_id=conversation_id,
+                                branch_id=branch_id,
+                            )
                         )
+                    except Exception as e:
+                        logger.error(f"Error logging conversation: {str(e)}")
                     # Assuming 'conversation' is a list of dicts with 'id' and 'message' keys
-                    messages_from_conversation = []
-                    for resp in conversation:
-                        if isinstance(resp, dict):
-                            msg = Message.from_dict(resp["message"])
-                            messages_from_conversation.append(msg)
-                            ids.append(resp["id"])
-                        else:
-                            logger.error(
-                                f"Unexpected type in conversation: {type(resp)}"
-                            )
-                    messages = messages_from_conversation + messages
+
+                    if conversation is not None:
+                        print("Gets into messages_from_conversation")
+                        messages_from_conversation: list[Message] = []
+                        for resp in conversation:
+                            if isinstance(resp, dict):
+                                msg = Message.from_dict(resp["message"])
+                                messages_from_conversation.append(msg)
+                                ids.append(resp["id"])
+                            else:
+                                logger.warning(
+                                    f"Unexpected type in conversation: {type(resp)}\n{resp}"
+                                )
+                        messages = messages_from_conversation + messages
                 else:
                     # Create new conversation
                     conversation_id = (
@@ -399,8 +398,6 @@ async def stream_response():
                     search_settings=search_settings,
                     rag_generation_config=rag_generation_config,
                     include_title_if_available=include_title_if_available,
-                    *args,
-                    **kwargs,
                 )
 
                 # Save the assistant's reply to the conversation
@@ -428,7 +425,7 @@ async def stream_response():
                     value=latency,
                 )
                 return {
-                    "messages": [msg.to_dict() for msg in results],
+                    "messages": results,
                     "conversation_id": str(
                         conversation_id
                     ),  # Ensure it's a string
@@ -443,7 +440,7 @@ async def stream_response():
                     )
                 raise HTTPException(
                     status_code=500,
-                    detail="Internal Server Error",
+                    detail=f"Internal Server Error - {str(e)}",
                 )
 
 
diff --git a/py/core/providers/logger/r2r_logger.py b/py/core/providers/logger/r2r_logger.py
index e46bac4ae..305eebb34 100644
--- a/py/core/providers/logger/r2r_logger.py
+++ b/py/core/providers/logger/r2r_logger.py
@@ -679,6 +679,7 @@ async def get_conversation(
                 )
             conversation_created_at = row[0]
 
+        print(f"Getting a branch_id: {branch_id}")
         if branch_id is None:
             # Get the most recent branch by created_at timestamp
             async with self.conn.execute(
@@ -691,14 +692,19 @@ async def get_conversation(
                 (conversation_id,),
             ) as cursor:
                 row = await cursor.fetchone()
+                print(f"Row: {row}")
                 branch_id = row[0] if row else None
 
         # If no branch exists, return empty results but with required fields
         if branch_id is None:
-            return {
-                "id": conversation_id,
-                "created_at": conversation_created_at,
-            }
+            logger.warning(
+                f"No branches found for conversation ID {conversation_id}"
+            )
+            return None
+            # return {
+            #     "id": conversation_id,
+            #     "created_at": conversation_created_at,
+            # }
 
         # Get all messages for this branch
         async with self.conn.execute(
