From 8f807a3006d6e6822683a68c2a530873a5a38bd9 Mon Sep 17 00:00:00 2001
From: Johann Kellerman <kellerza@gmail.com>
Date: Sat, 10 Mar 2018 01:52:21 +0200
Subject: [PATCH] Safe fix for #13015 (#13024)

---
 homeassistant/bootstrap.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 2f093f061d9..50d8502bbd1 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -113,7 +113,10 @@ def async_from_config_dict(config: Dict[str, Any],
         yield from hass.async_add_job(loader.prepare, hass)
 
     # Make a copy because we are mutating it.
-    config = OrderedDict(config)
+    new_config = OrderedDict()
+    for key, value in config.items():
+        new_config[key] = value or {}
+    config = new_config
 
     # Merge packages
     conf_util.merge_packages_config(