diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 46e814902..3a8299137 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -532,7 +532,7 @@ Value AExpression::OpObject(const AExpression* expr, const Dictionary::Ptr& loca
 	}
 
 	if (!checkName.IsEmpty()) {
-		ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, name);
+		ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, checkName);
 
 		if (oldItem) {
 			std::ostringstream msgbuf;
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index baaf0e5d7..c1263a15f 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -129,7 +129,7 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
 			const DynamicObjectNameHelper *nh = dynamic_cast<const DynamicObjectNameHelper *>(Type::GetByName(m_Type));
 
 			if (nh) {
-				String name = nh->MakeObjectName(m_Name, m_Properties);
+				name = nh->MakeObjectName(m_Name, m_Properties);
 
 				if (name.IsEmpty())
 					BOOST_THROW_EXCEPTION(std::runtime_error("Could not determine name for object"));