Added some error catching for the comments.