diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 3dd31df9c..6d93570ee 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -470,7 +470,14 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 				if (item->m_Type != type)
 					return;
 
-				ip.first->Commit(ip.second);
+				if (!item->Commit(ip.second)) {
+					if (item->IsIgnoreOnError()) {
+						item->Unregister();
+					}
+
+					return;
+				}
+
 				committed_items++;
 			});