diff --git a/ChangeLog b/ChangeLog
index 08a5ed9b9..2e7952e50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-12  Robert Love  <rml@novell.com>
+
+	* src/named-manager/nm-named-manager.c: Don't unref the config until
+	  after we call rewrite_resolv_conf(), because get_last_default_domain()
+	  needs to access the config.  Fixes "rewrite_resolv_conf: assertion
+	  `config != NULL' failed" assertion failures and "Could not commit DNS
+	  changes" warnings.
+
 2005-12-12  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-util/dbus-helpers.[ch]
diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
index 6d07f9eb2..2d710be79 100644
--- a/src/named-manager/nm-named-manager.c
+++ b/src/named-manager/nm-named-manager.c
@@ -706,9 +706,6 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr, NMIP4Config *config)
 	if (mgr->priv->use_named)
 		remove_ip4_config_from_named (mgr, config);
 
-	mgr->priv->configs = g_slist_remove (mgr->priv->configs, config);
-	nm_ip4_config_unref (config);
-
 	/* Clear out and reload configs since we may need a new
 	 * default zone if the one we are removing was the old
 	 * default zone.
@@ -726,6 +723,9 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr, NMIP4Config *config)
 			g_error_free (error);
 	}
 
+	mgr->priv->configs = g_slist_remove (mgr->priv->configs, config);
+	nm_ip4_config_unref (config);
+
 	return TRUE;
 }