Slightly more defensive, and update comment.