Line 2282 and 2285 of the diff, though I don't think it should actually come up in this diff because I think I'm catching the "null"s in the view.