diff --git a/ChangeLog b/ChangeLog
index f8188d6194..12082e55f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-23  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting.c
+		- (setting_wireless_security_need_secrets): ensure auth_alg is !NULL
+			before trying to do something with it
+
 2007-10-23  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-device-802-11-wireless.c
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 34231ef25c..329a9f17c8 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -1268,6 +1268,7 @@ setting_wireless_security_need_secrets (NMSetting *setting)
 
 	/* LEAP */
 	if (   (strcmp (self->key_mgmt, "ieee8021x") == 0)
+	    && self->auth_alg
 	    && (strcmp (self->auth_alg, "leap") == 0)
 	    && (string_list_contains (self->eap, "leap"))) {
 		if (!self->password || !strlen (self->password)) {