--- a/app/soc/models/base.py	Thu Apr 02 23:05:56 2009 +0000
+++ b/app/soc/models/base.py	Thu Apr 02 23:06:15 2009 +0000
@@ -58,14 +58,14 @@
     """
 
     result = {}
-    props = self.properties()
 
     if not field_names:
+      props = self.properties()
       field_names = [k for k, v in props.iteritems() if isinstance(v, self.DICT_TYPES)]
 
-    for key, value in props.iteritems():
+    for key in field_names:
       # Skip everything that is not valid
-      if key not in field_names:
+      if not hasattr(self, key):
         continue
 
       result[key] = getattr(self, key)