This fixes an error message, and adds handling of internal AWS errors (exiting rather than hanging indefinitely). Sponsored by: Amazon
1a55b396c1