Null check in Views plugin

also publicized some internal types so I could use our corrected plugin (would be nice to have public anyway).  Not sure why this condition exists, but it's causing our Views plugin to fail.