Merge pull request #3015 from tnull/2024-04-sweeper-error-on-persistence-failure