Rather than have to handle null here (and elsewhere), can't we find a way to make sure ContentState values are never null?