Check if EntryComment is defined and not null

Check if EntryComment is defined and not null #3885