Correct comment text
Change exception handling