@@ -47,6 +47,7 @@ else:

 try:

     import xml.etree.ElementTree as ET

+    from xml.etree.ElementTree import ParseError

 except ImportError:

     import elementtree.ElementTree as ET

 from xml.parsers.expat import ExpatError

@@ -92,6 +93,11 @@ def getTreeFromXml(xml):

     except ExpatError, e:

         error(e)

         raise Exceptions.ParameterError("Bucket contains invalid filenames. Please run: s3cmd fixbucket s3://your-bucket/")

+    except ParseError, e:

+        error(e)

+        error(xml)

+        raise

+

 __all__.append("getTreeFromXml")

 def getListFromXml(xml, node):