diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 992fed78fe..7bf2f31211 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -242,6 +242,10 @@ Status DBImpl::Query(const std::string& table_id, const std::vector<std::string>
         return status;
     }
 
+    if(files_array.empty()) {
+        return Status::Error("Invalid file id");
+    }
+
     return QueryAsync(table_id, files_array, k, nq, vectors, dates, results);
 }
 
diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index 82a2abdeda..75ceddcba9 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -628,6 +628,7 @@ Status DBMetaImpl::GetTableFiles(const std::string& table_id,
 
         for (auto &file : files) {
             TableFileSchema file_schema;
+            file_schema.table_id_ = table_id;
             file_schema.file_id_ = std::get<0>(file);
             file_schema.file_type_ = std::get<1>(file);
             file_schema.size_ = std::get<2>(file);