diff --git a/ChangeLog b/ChangeLog
index f9835bff8a..b75147d9e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-10  Robert Love  <rml@novell.com>
+
+	* src/nm-ap-security-wpa-eap.c: Pass fake empty strings for
+	  serialization if strings are NULL, lest DBUS get angry.
+
+
 2006-03-10  Robert Love  <rml@novell.com>
 
 	* src/nm-ap-security-wpa-eap.c: Don't log the password.
diff --git a/src/nm-ap-security-wpa-eap.c b/src/nm-ap-security-wpa-eap.c
index 564f5df82b..0cd107da34 100644
--- a/src/nm-ap-security-wpa-eap.c
+++ b/src/nm-ap-security-wpa-eap.c
@@ -128,15 +128,15 @@ real_serialize (NMAPSecurity *instance, DBusMessageIter *iter)
 	NMAPSecurityWPA_EAP * self = NM_AP_SECURITY_WPA_EAP (instance);
 
 	if (!nmu_security_serialize_wpa_eap (iter,
-								  self->priv->eap_method,
-								  self->priv->identity,
-								  self->priv->passwd,
-								  self->priv->anon_identity,
-								  self->priv->private_key_passwd,
-								  self->priv->private_key_file,
-								  self->priv->client_cert_file,
-								  self->priv->ca_cert_file,
-								  self->priv->wpa_version))
+			self->priv->eap_method,
+			self->priv->identity ? : "",
+			self->priv->passwd ? : "",
+			self->priv->anon_identity ? : "",
+			self->priv->private_key_passwd ? : "",
+			self->priv->private_key_file ? : "",
+			self->priv->client_cert_file ? : "",
+			self->priv->ca_cert_file ? : "",
+			self->priv->wpa_version))
 		return -1;
 	return 0;
 }