Merge "Fix handling of bad image previews."