diff --git a/ChangeLog b/ChangeLog
index d4b30ac250..d0ce08f53b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-12  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_exec): ensure GError is correctly initialized
+			Reported by Diego González (gnome.org #326708)
+
 2006-01-11  Robert Love  <rml@novell.com>
 
 	* src/nm-device-802-3-ethernet.c: In case local copies of glibc do not
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 7af628ac06..3c73c7ee4b 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2378,7 +2378,7 @@ supplicant_exec (NMDevice80211Wireless *self)
 {
 	gboolean	success = FALSE;
 	char *	argv[4];
-	GError *	error;
+	GError *	error = NULL;
 	GPid		pid = -1;
 
 	argv[0] = WPA_SUPPLICANT_BINARY;