Fixed catcher behavior for checkpoints