Fix
Handle failed scans
Checkpoint