Only consider non empy line when displaying "..."
Avoid crash when the text to be displayed is null
Merge remote-tracking branch 'origin/master'