(no commit message)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 02d0f70b8082db288e00ce04efb265ef5dd30765..caa1ee9cfaf635c7c179107bbc9ab63ab0141739 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -196,7 +196,10 @@ class UnitOfWork(object):
             childlist = UOWListElement(obj, childlist)
             obj.__dict__[key] = childlist
         if data is not None and childlist.data != data:
-            childlist.set_data(data)
+            try:
+                childlist.set_data(data)
+            except TypeError:
+                raise "object " + repr(data) + " is not an iterable object"
         return childlist
         
     def register_clean(self, obj):