Fix comment
Fix NPE