Better handling of files/images that are not in blobs. Refs #8937.