AWS plugin—including unit testing files and updated code with error handling