Fixup, take care of cases where the view is null