Remove a comment, add some checks.