diff -r 065e5bcf90f0 -r a94c9bcfa05d app/soc/logic/models/site.py
--- a/app/soc/logic/models/site.py	Sat Feb 07 20:37:28 2009 +0000
+++ b/app/soc/logic/models/site.py	Sat Feb 07 20:39:08 2009 +0000
@@ -83,7 +83,13 @@
         'link_id': self.DEF_SITE_LINK_ID,
         }
 
-    return self.getFromKeyFields(fields)
+    key_name = self.getKeyNameFromFields(fields)
+    singleton = self.getFromKeyName(key_name)
 
+    # if there is no site singleton yet, create it
+    if not singleton:
+      singleton = self.updateOrCreateFromKeyName(fields, key_name)
+
+    return singleton
 
 logic = Logic()