diff --git a/ChangeLog b/ChangeLog
index 914fb4b842..3be9f22407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-04  Dan Williams  <dcbw@redhat.com>
+
+	* src/supplicant-manager/nm-supplicant-interface.c
+		- (bssid_properties_cb): don't treat DBus errors as valid
+			scanned AP messages
+
 2006-12-04  Dan Williams  <dcbw@redhat.com>
 
 	* src/supplicant-manager/nm-supplicant-interface.[ch]
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 1431a9c605..b48ce10d20 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -506,6 +506,17 @@ bssid_properties_cb (DBusPendingCall * pcall,
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
+	if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) {
+		if (!dbus_set_error_from_message (&error, reply)) {
+			nm_warning ("Couldn't set error from DBus message.");
+			goto out;
+		}
+		nm_warning ("Couldn't retrieve BSSID properties: %s - %s",
+		            error.name,
+		            error.message);
+		goto out;
+	}
+
 	g_signal_emit (G_OBJECT (self),
 	               nm_supplicant_interface_signals[SCANNED_AP],
 	               0,