Deal with the case where a pod goes away after we list it.

Fixes #1678
Merge pull request #1790 from jbeda/1678-fix-e2e

Deal with the case where a pod goes away after we list it.