diff --git a/.pick_status.json b/.pick_status.json
index 8034590751c..fc4eef2b94d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1264,7 +1264,7 @@
         "description": "util/foz: stop crashing on destroy if prepare hasn't been called",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "eca6bb9540d8d1b260511cd0a71bdddb00ff4a3c"
     },
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 37f1d4ccacb..92c180c6944 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -340,7 +340,8 @@ foz_prepare(struct foz_db *foz_db, char *cache_path)
 void
 foz_destroy(struct foz_db *foz_db)
 {
-   fclose(foz_db->db_idx);
+   if (foz_db->db_idx)
+      fclose(foz_db->db_idx);
    for (unsigned i = 0; i < FOZ_MAX_DBS; i++) {
       if (foz_db->file[i])
          fclose(foz_db->file[i]);