From 4070702931aa29c32bcf0f41c414d11bc4a89f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Fri, 24 Jun 2016 14:42:55 +0200
Subject: [PATCH] Fix error in deep_dict when settings substructure defaults to
 None

---
 src/octoprint/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index df4537a2..df2b53a1 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -419,7 +419,7 @@ class HierarchicalChainMap(ChainMap):
 	def _hierarchy_for_key(cls, key, chain):
 		wrapped_mappings = list()
 		for mapping in chain.maps:
-			if key in mapping:
+			if key in mapping and mapping[key] is not None:
 				wrapped_mappings.append(mapping[key])
 			else:
 				wrapped_mappings.append(dict())