6 Commits (error-handling)