Don't raise or catch StandardError in amazon modules

lib/ansible/modules/extras/cloud/amazon/sqs_queue.py

@@ -219,8 +219,8 @@ def main():
 
     try:
         connection = connect_to_aws(boto.sqs, region, **aws_connect_params)
-        
-    except (NoAuthHandlerFound, StandardError), e:
+
+    except (NoAuthHandlerFound, AnsibleAWSError), e:
         module.fail_json(msg=str(e))
 
     state = module.params.get('state')
@@ -234,4 +234,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()