Do not stack trace AmazonClientException.
Remove redundant return.
Upload with new name.