change exception handling, add a comment