Amazon adapter refactoring: error handling, simplification