diff --git a/src/cats/dml/0036_select_recent_version.postgresql b/src/cats/dml/0036_select_recent_version.postgresql
index 7c477d9ad3b..ce5f6dd241f 100644
--- a/src/cats/dml/0036_select_recent_version.postgresql
+++ b/src/cats/dml/0036_select_recent_version.postgresql
@@ -1,3 +1,4 @@
+
 SELECT DISTINCT ON (File.Name,
                     PathId) JobTDate,
                    JobId,
@@ -7,8 +8,9 @@ SELECT DISTINCT ON (File.Name,
                    File.Name,
                    LStat,
                    MD5
-FROM File
+FROM FILE
 JOIN Job USING (JobId)
-WHERE JobId IN (%s) BY File.Name,
-                       PathId,
-                       JobTDate DESC
+WHERE JobId IN (%s)
+ORDER BY File.Name,
+         PathId,
+         JobTDate DESC
diff --git a/src/dird/backup.c b/src/dird/backup.c
index 2c3e01f563b..b6478aaaf7d 100644
--- a/src/dird/backup.c
+++ b/src/dird/backup.c
@@ -355,9 +355,15 @@ bool send_accurate_current_files(JCR *jcr)
 
    if (jcr->HasBase) {
       jcr->nb_base_files = str_to_int64(nb.list);
-      jcr->db->create_base_file_list(jcr, jobids.list);
-      jcr->db->get_base_file_list(jcr, jcr->use_accurate_chksum,
-                                  accurate_list_handler, (void *)jcr);
+      if (!jcr->db->create_base_file_list(jcr, jobids.list)){
+         Jmsg0(jcr, M_FATAL, 0, "error in jcr->db->create_base_file_list\n");
+         return false;
+      }
+      if (!jcr->db->get_base_file_list(jcr, jcr->use_accurate_chksum,
+                                  accurate_list_handler, (void *)jcr)) {
+         Jmsg0(jcr, M_FATAL, 0, "error in jcr->db->get_base_file_list\n");
+         return false;
+      }
    } else {
       if (!jcr->db->open_batch_connection(jcr)) {
          Jmsg0(jcr, M_FATAL, 0, "Can't get batch sql connection");