Improve folder upload error handling.

Do you handle the case where both files are new?