Add check for null content_charset