Handle unencrypted files better.