Chg: Add more null checks before inserting comments.