Slightly better handling of missing images.