diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py
index 0b7839536..61c9e98da 100644
--- a/ipaserver/plugins/baseldap.py
+++ b/ipaserver/plugins/baseldap.py
@@ -1788,7 +1788,7 @@ class LDAPAddMember(LDAPModMember):
         completed = 0
         for (attr, objs) in member_dns.items():
             for ldap_obj_name in objs:
-                for m_dn in member_dns[attr][ldap_obj_name]:
+                for m_dn in objs[ldap_obj_name]:
                     assert isinstance(m_dn, DN)
                     if not m_dn:
                         continue
diff --git a/ipatests/test_xmlrpc/tracker/base.py b/ipatests/test_xmlrpc/tracker/base.py
index e5a05adf1..c2b8c3a1c 100644
--- a/ipatests/test_xmlrpc/tracker/base.py
+++ b/ipatests/test_xmlrpc/tracker/base.py
@@ -155,9 +155,7 @@ class ModificationTracker(BaseTracker):
         result = command()
         self.attrs.update(updates)
         self.attrs.update(expected_updates)
-        for key, value in self.attrs.items():
-            if value is None:
-                del self.attrs[key]
+        self.attrs = {k: v for k, v in self.attrs.items() if v is not None}
 
         self.check_update(
             result,