Add null check to avoid exception when author is null