improve error handling for AWS s3.

Conflicts:
	CHANGES.txt