Index: adapter.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/adapter.c,v
retrieving revision 1.13
diff -u -p -r1.13 adapter.c
--- adapter.c	28 Jan 2008 10:38:40 -0000	1.13
+++ adapter.c	1 Feb 2008 10:44:20 -0000
@@ -302,16 +302,18 @@ static DBusHandlerResult adapter_get_inf
 			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
 			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
-	dbus_message_iter_append_dict_entry(&dict, "address",
-			DBUS_TYPE_STRING, &property);
-
-	memset(str, 0, sizeof(str));
-	property = str;
-	str2ba(adapter->address, &ba);
-
-	if (!read_local_name(&ba, str))
-		dbus_message_iter_append_dict_entry(&dict, "name",
-			DBUS_TYPE_STRING, &property);
+	if (check_address (property) == 0) {
+		dbus_message_iter_append_dict_entry(&dict, "address",
+						    DBUS_TYPE_STRING, &property);
+
+		memset(str, 0, sizeof(str));
+		property = str;
+		str2ba(adapter->address, &ba);
+
+		if (!read_local_name(&ba, str))
+			dbus_message_iter_append_dict_entry(&dict, "name",
+							    DBUS_TYPE_STRING, &property);
+	}
 
 	get_device_version(adapter->dev_id, str, sizeof(str));
 	dbus_message_iter_append_dict_entry(&dict, "version",
@@ -337,7 +339,7 @@ static DBusHandlerResult adapter_get_inf
 	dbus_message_iter_append_dict_entry(&dict, "discoverable_timeout",
 				DBUS_TYPE_UINT32, &adapter->discov_timeout);
 
-	if (!read_local_class(&ba, cls)) {
+	if (check_address (property) == 0 && !read_local_class(&ba, cls)) {
 		uint32_t class;
 
 		memcpy(&class, cls, 3);
@@ -368,6 +370,9 @@ static DBusHandlerResult adapter_get_add
 	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
 		return error_invalid_arguments(conn, msg, NULL);
 
+	if (check_address (paddr) < 0)
+		return error_not_ready(conn, msg);
+
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
Index: dbus-api.txt
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/dbus-api.txt,v
retrieving revision 1.135
diff -u -p -r1.135 dbus-api.txt
--- dbus-api.txt	28 Jan 2008 10:38:40 -0000	1.135
+++ dbus-api.txt	1 Feb 2008 10:44:20 -0000
@@ -335,7 +335,7 @@ Methods		dict GetInfo()
 
 			Example: "00:11:22:33:44:55"
 
-			Possible errors: none
+			Possible errors: org.bluez.Error.NotReady
 
 		string GetVersion()