Handle Message as a key in errors

setup.py

@@ -21,7 +21,7 @@ DESC = 'A low-level Amazon Web Services API client for Tornado'
 TESTS_REQUIRE = ['nose', 'mock', 'coverage']
 setuptools.setup(name='tornado-aws',
-                 version='0.4.4',
+                 version='0.4.5',
                  description=DESC,
                  long_description=open('README.rst').read(),
                  author='Gavin M. Roy',

tornado_aws/__init__.py

@@ -6,6 +6,6 @@ from tornado_aws.client import AWSClient
 from tornado_aws.client import AsyncAWSClient
 from tornado_aws.client import exceptions
-__version__ = '0.4.4'
+__version__ = '0.4.5'
 __all__ = ['AWSClient', 'AsyncAWSClient', 'exceptions']

tornado_aws/client.py

@@ -496,12 +496,12 @@ class AsyncAWSClient(AWSClient):
                                                      headers, body, True)
                                 self._ioloop.add_future(request, on_retry)
                                 return
-                    if 'message' not in awz_error:
+                    msg = aws_error.get('message', aws_error.get('Message'))
+                    if not msg:
                         LOGGER.debug('awz_error without message: %r',
                                      awz_error)
                     exception = exceptions.AWSError(
-                        type=awz_error['__type'],
-                        message=awz_error.get('message'))
+                        type=awz_error['__type'], message=msg)
                 future.set_exception(exception)
             else:
                 future.set_result(response.result())