not a problem with this PR per se, but while looking at the code anyway, do we need to make sure here that we try to close the store if "Cannot set the file's id." occurs?