diff --git a/library/cloud/rds b/library/cloud/rds index 7d6e0e6ce7..bd2490a0fb 100644 --- a/library/cloud/rds +++ b/library/cloud/rds @@ -463,8 +463,12 @@ def main(): if command == 'delete' and not wait: module.exit_json(changed=True) - instances = conn.get_all_dbinstances(instance_name) - my_inst = instances[0] + try: + instances = conn.get_all_dbinstances(instance_name) + my_inst = instances[0] + except boto.exception.BotoServerError, e: + module.fail_json(msg = e.error_message) + # Wait for the instance to be available if requested if wait: