--- __init__.py-org     2007-10-28 18:10:18.000000000 +0100
+++ __init__.py 2007-11-04 04:31:20.961212000 +0100
@@ -329,7 +329,10 @@
     def next(self):
         chunk = self._iterator.next()
         if isinstance(chunk, unicode):
-            chunk = chunk.encode(self._charset)
+            try:
+                chunk = chunk.encode(self._charset)
+            except UnicodeEncodeError, e:
+                chunk = chunk.encode(self._charset, "replace")
         return chunk

     def close(self):