Ensure pre-normalize file ID progresses even on failure

Fixes #7012