Remove an old comment.
Update error handling.