diff --git a/gnome/applet/nm-gconf-wso-wpa-eap.c b/gnome/applet/nm-gconf-wso-wpa-eap.c
index 4c0ef532c4..66c3ead0b0 100644
--- a/gnome/applet/nm-gconf-wso-wpa-eap.c
+++ b/gnome/applet/nm-gconf-wso-wpa-eap.c
@@ -87,14 +87,6 @@ nm_gconf_wso_wpa_eap_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
 	security->priv->client_cert_file = g_strdup (client_cert_file);
 	security->priv->ca_cert_file = g_strdup (ca_cert_file);
 
-	dbus_free (identity);
-	dbus_free (passwd);
-	dbus_free (anon_identity);
-	dbus_free (private_key_passwd);
-	dbus_free (private_key_file);
-	dbus_free (client_cert_file);
-	dbus_free (ca_cert_file);
-
 out:
 	return security;
 }
@@ -222,13 +214,13 @@ real_serialize_dbus (NMGConfWSO *instance, DBusMessageIter *iter)
 
 	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->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 FALSE;
 	return TRUE;
diff --git a/gnome/applet/nm-gconf-wso-wpa-psk.c b/gnome/applet/nm-gconf-wso-wpa-psk.c
index 96b5728a5c..a69a7ea597 100644
--- a/gnome/applet/nm-gconf-wso-wpa-psk.c
+++ b/gnome/applet/nm-gconf-wso-wpa-psk.c
@@ -63,8 +63,6 @@ nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
 	security->priv->wpa_version = wpa_version;
 	security->priv->key_mgt = key_mgt;
 
-	dbus_free (key);
-
 out:
 	return security;
 }
diff --git a/gnome/applet/wso-wpa-eap.c b/gnome/applet/wso-wpa-eap.c
index df60074796..f7ae4c7467 100644
--- a/gnome/applet/wso-wpa-eap.c
+++ b/gnome/applet/wso-wpa-eap.c
@@ -44,9 +44,9 @@ struct OptData
 	const char *	passwd;
 	const char *	anon_identity;
 	const char *	private_key_passwd;
-	char *		private_key_file;
-	char *		client_cert_file;
-	char *		ca_cert_file;
+	const char *	private_key_file;
+	const char *	client_cert_file;
+	const char *	ca_cert_file;
 	gboolean		wpa2;
 };
 
@@ -57,10 +57,6 @@ data_free_func (WirelessSecurityOption *opt)
 	g_return_if_fail (opt != NULL);
 	g_return_if_fail (opt->data != NULL);
 
-	g_free (opt->data->private_key_file);
-	g_free (opt->data->client_cert_file);
-	g_free (opt->data->ca_cert_file);
-
 	memset (opt->data, 0, sizeof (opt->data));
 	g_free (opt->data);
 }
diff --git a/src/nm-ap-security-wpa-eap.c b/src/nm-ap-security-wpa-eap.c
index 88ddf8a613..14dca5ae4f 100644
--- a/src/nm-ap-security-wpa-eap.c
+++ b/src/nm-ap-security-wpa-eap.c
@@ -91,14 +91,6 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
 	else
 		nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA Enterprise"));
 
-	dbus_free (identity);
-	dbus_free (passwd);
-	dbus_free (anon_identity);
-	dbus_free (private_key_passwd);
-	dbus_free (private_key_file);
-	dbus_free (client_cert_file);
-	dbus_free (ca_cert_file);
-
 out:
 	return security;
 }
diff --git a/src/nm-ap-security-wpa-psk.c b/src/nm-ap-security-wpa-psk.c
index 4f2a307544..5a234dfaa3 100644
--- a/src/nm-ap-security-wpa-psk.c
+++ b/src/nm-ap-security-wpa-psk.c
@@ -83,10 +83,7 @@ nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
 	security = g_object_new (NM_TYPE_AP_SECURITY_WPA_PSK, NULL);
 	nm_ap_security_set_we_cipher (NM_AP_SECURITY (security), we_cipher);
 	if (key)
-	{
 		nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len);
-		dbus_free (key);
-	}
 	security->priv->wpa_version = wpa_version;
 	security->priv->key_mgt = key_mgt;