diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp
index aa3795987c..be44c50514 100644
--- a/source/gui/CDropDown.cpp
+++ b/source/gui/CDropDown.cpp
@@ -34,13 +34,11 @@ CDropDown::CDropDown(CGUI& pGUI)
 	AddSetting<float>("dropdown_size");
 	AddSetting<float>("dropdown_buffer");
 	AddSetting<u32>("minimum_visible_items");
-//	AddSetting<CStrW, "font");
 	AddSetting<CStrW>("sound_closed");
-	AddSetting<CStrW>("sound_disabled");
 	AddSetting<CStrW>("sound_enter");
 	AddSetting<CStrW>("sound_leave");
 	AddSetting<CStrW>("sound_opened");
-	AddSetting<CGUISpriteInstance>("sprite");				// Background that sits around the size
+	// Setting "sprite" is registered by CList and used as the background
 	AddSetting<CGUISpriteInstance>("sprite_disabled");
 	AddSetting<CGUISpriteInstance>("sprite_list");			// Background of the drop down list
 	AddSetting<CGUISpriteInstance>("sprite2");				// Button that sits to the right
@@ -52,7 +50,6 @@ CDropDown::CDropDown(CGUI& pGUI)
 	// Add these in CList! And implement TODO
 	//AddSetting<CGUIColor>("textcolor_over");
 	//AddSetting<CGUIColor>("textcolor_pressed");
-	AddSetting<CGUIColor>("textcolor_selected");
 	AddSetting<CGUIColor>("textcolor_disabled");
 
 	// Scrollbar is forced to be true.
diff --git a/source/gui/IGUIObject.cpp b/source/gui/IGUIObject.cpp
index fda54034a2..dfa79b10e4 100644
--- a/source/gui/IGUIObject.cpp
+++ b/source/gui/IGUIObject.cpp
@@ -116,11 +116,10 @@ void IGUIObject::AddToPointersMap(map_pObjects& ObjectMap)
 template<typename T>
 void IGUIObject::AddSetting(const CStr& Name)
 {
-	// This can happen due to inheritance
 	if (SettingExists(Name))
-		return;
-
-	m_Settings[Name] = new CGUISetting<T>(*this, Name);
+		LOGERROR("The setting '%s' already exists on the object '%s'!", Name.c_str(), GetPresentableName().c_str());
+	else
+		m_Settings.emplace(Name, new CGUISetting<T>(*this, Name));
 }
 
 bool IGUIObject::SettingExists(const CStr& Setting) const