Improve handling of missing imagery.