Add a few checks to ensure we don't show null content