diff --git a/core/doctype/control_panel/control_panel.py b/core/doctype/control_panel/control_panel.py
index cad9748815..c487e2a97d 100644
--- a/core/doctype/control_panel/control_panel.py
+++ b/core/doctype/control_panel/control_panel.py
@@ -25,9 +25,6 @@ import webnotes
 
 from webnotes import form, msgprint
 
-	
-
-
 class DocType:
 	def __init__(self, doc, doclist):
 		self.doc = doc
diff --git a/webnotes/defaults.py b/webnotes/defaults.py
index 7cd0abcfdd..065110aa22 100644
--- a/webnotes/defaults.py
+++ b/webnotes/defaults.py
@@ -114,7 +114,7 @@ def get_defaults_for(parent="Control Panel"):
 				
 				if d.defvalue not in defaults[d.defkey]:
 					defaults[d.defkey].append(d.defvalue)
-			else:
+			elif d.defvalue is not None:
 				defaults[d.defkey] = d.defvalue
 		
 		if webnotes.session and parent == webnotes.session.user: