fix handling of no-checkpoint-defined

a few typos and missing handling of undefined checkpoint

regression introduced in #6205