Small NPE check and more comments.