diff --git a/api/apps/document_app.py b/api/apps/document_app.py
index bd2262919..4755453d4 100644
--- a/api/apps/document_app.py
+++ b/api/apps/document_app.py
@@ -706,6 +706,7 @@ async def set_meta():
     except Exception as e:
         return server_error_response(e)
 
+
 @manager.route("/upload_info", methods=["POST"])  # noqa: F821
 async def upload_info():
     files = await request.files
diff --git a/api/db/services/dialog_service.py b/api/db/services/dialog_service.py
index ae79b45a6..d5d0e1664 100644
--- a/api/db/services/dialog_service.py
+++ b/api/db/services/dialog_service.py
@@ -676,7 +676,11 @@ Please write the SQL, only SQL, without any other explanations or text.
         if kb_ids:
             kb_filter = "(" + " OR ".join([f"kb_id = '{kb_id}'" for kb_id in kb_ids]) + ")"
             if "where" not in sql.lower():
-                sql += f" WHERE {kb_filter}"
+                o = sql.lower().split("order by")
+                if len(o) > 1:
+                    sql = o[0] + f" WHERE {kb_filter}  order by " + o[1]
+                else:
+                    sql += f" WHERE {kb_filter}"
             else:
                 sql += f" AND {kb_filter}"
 
@@ -684,10 +688,9 @@ Please write the SQL, only SQL, without any other explanations or text.
         tried_times += 1
         return settings.retriever.sql_retrieval(sql, format="json"), sql
 
-    tbl, sql = get_table()
-    if tbl is None:
-        return None
-    if tbl.get("error") and tried_times <= 2:
+    try:
+        tbl, sql = get_table()
+    except Exception as e:
         user_prompt = """
         Table name: {};
         Table of database fields are as follows:
@@ -701,16 +704,14 @@ Please write the SQL, only SQL, without any other explanations or text.
         The SQL error you provided last time is as follows:
         {}
 
-        Error issued by database as follows:
-        {}
-
         Please correct the error and write SQL again, only SQL, without any other explanations or text.
-        """.format(index_name(tenant_id), "\n".join([f"{k}: {v}" for k, v in field_map.items()]), question, sql, tbl["error"])
-        tbl, sql = get_table()
-        logging.debug("TRY it again: {}".format(sql))
+        """.format(index_name(tenant_id), "\n".join([f"{k}: {v}" for k, v in field_map.items()]), question, e)
+        try:
+            tbl, sql = get_table()
+        except Exception:
+            return
 
-    logging.debug("GET table: {}".format(tbl))
-    if tbl.get("error") or len(tbl["rows"]) == 0:
+    if len(tbl["rows"]) == 0:
         return None
 
     docid_idx = set([ii for ii, c in enumerate(tbl["columns"]) if c["name"] == "doc_id"])
diff --git a/rag/utils/es_conn.py b/rag/utils/es_conn.py
index 5971950cf..cca3fc7c7 100644
--- a/rag/utils/es_conn.py
+++ b/rag/utils/es_conn.py
@@ -575,9 +575,9 @@ class ESConnection(DocStoreConnection):
                 time.sleep(3)
                 self._connect()
                 continue
-            except Exception:
-                logger.exception("ESConnection.sql got exception")
-                break
+            except Exception as e:
+                logger.exception(f"ESConnection.sql got exception. SQL:\n{sql}")
+                raise Exception(f"SQL error: {e}\n\nSQL: {sql}")
         logger.error(f"ESConnection.sql timeout for {ATTEMPT_TIME} times!")
         return None