Backport a fix from the COLIBRE repo to solve a segfault in the cleaning routines when ending a run that restarted from check-point files.