Please review branch feature/more-error-handling