--- a/server/hooks.py	Mon Dec 14 10:45:14 2009 +0100
+++ b/server/hooks.py	Mon Dec 14 14:49:37 2009 +0100
@@ -244,7 +244,8 @@
     if session.is_super_session:
         return
     eschema = entity.e_schema
-    for attr, val in entity.items():
+    for attr in entity.edited_attributes:
+        val = entity[attr]:
         if val is None:
             continue
         if eschema.subjrels[attr].final and \
@@ -261,7 +262,7 @@
         return
     schema = session.vreg.schema
     for attr in entity.edited_attributes:
-        if schema.rschema(attr).final:
+        if eschema.subjrels[attr].final:
             constraints = [c for c in entity.e_schema.constraints(attr)
                            if isinstance(c, (RQLConstraint, RQLUniqueConstraint))]
             if constraints: