fix handling of no-checkpoint-defined

a few typos and missing handling of undefined checkpoint

regression introduced in #6205
Merge pull request #6370 from minrk/handle-no-checkpoint

fix handling of no-checkpoint-defined