diff --git a/screenless/bureau/bureau.py b/screenless/bureau/bureau.py
index ca52348..1f9611f 100644
--- a/screenless/bureau/bureau.py
+++ b/screenless/bureau/bureau.py
@@ -267,6 +267,8 @@ class Bureau(object):
                 yaml.dump(self.default_config, configfile)
         with open(cfgfile) as cfp:
             self.config = yaml.load(cfp)
+            if self.config is None:
+                self.config = {}
 
     def send(self, recipient, message, data=None):
         """