checkpoint: some working options + error handling