Checkpoint
Add prettier error handling