@@ -59,7 +59,10 @@ class S3Error (S3Exception):

             except XmlParseError:

                 debug("Not an XML response")

             else:

-                self.info.update(self.parse_error_xml(tree))

+                try:

+                    self.info.update(self.parse_error_xml(tree))

+                except Exception, e:

+                    error("Error parsing xml: %s.  ErrorXML: %s" % (e, response["data"]))

         self.code = self.info["Code"]

         self.message = self.info["Message"]

@@ -98,11 +101,13 @@ class S3Error (S3Exception):

         error_node = tree

         if not error_node.tag == "Error":

             error_node = tree.find(".//Error")

-        for child in error_node.getchildren():

-            if child.text != "":

-                debug("ErrorXML: " + child.tag + ": " + repr(child.text))

-                info[child.tag] = child.text

-

+            if error_node is not None:

+                for child in error_node.getchildren():

+                    if child.text != "":

+                        debug("ErrorXML: " + child.tag + ": " + repr(child.text))

+                        info[child.tag] = child.text

+            else:

+                raise S3ResponseError("Malformed error XML returned from remote server.")

         return info