Added loops to wait for crappy AWS responses