Updated reporter to be less opinionated in what is thrown