Correction for exception throw and comments.