Only attempt file upload to S3 if validation is passed

In some cases files were being uploaded before all validation had taken place.  This ensures file uploads are only attempted after as much validation as possible has passed without error.