Clean up handling of missing imagery.