Yea, to make it consistent with the other EC2 methods, I'd change it to an AgentRuntimeException. Similarly, I'd change the for loop to a while loop.