Index: trunk/packages/invirt-base/debian/changelog
===================================================================
--- trunk/packages/invirt-base/debian/changelog	(revision 1934)
+++ trunk/packages/invirt-base/debian/changelog	(revision 1935)
@@ -5,4 +5,5 @@
   * invirt.config: fix an error on empty config files
   * invirt.common: give clearer error message on missing config variable
+  * invirt.common: handle yaml's None with empty struct for good error message
 
  -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 19:18:51 -0500
Index: trunk/packages/invirt-base/python/invirt/common.py
===================================================================
--- trunk/packages/invirt-base/python/invirt/common.py	(revision 1934)
+++ trunk/packages/invirt-base/python/invirt/common.py	(revision 1935)
@@ -40,4 +40,6 @@
     elif type(x) == list:
         return [dicts2struct(v, newprefix(i)) for i, v in enumerate(x)]
+    elif x is None:
+        return struct({}, prefix)
     else:
         return x
