add missing view, deal with bad data a little closer to the source