diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 98aedfca50..60fd1938d2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-15  Kevin Buettner  <kevinb@redhat.com>
+
+	* remote.c (remote_get_thread_local_address): Throw a more
+	meaningful exception when remote target doesn't have support
+	for the qGetTLSAddr packet.
+
 2005-04-15  Kevin Buettner  <kevinb@redhat.com>
 
 	* remote.c (remote_protocol_qGetTLSAddr): New static global variable.
diff --git a/gdb/remote.c b/gdb/remote.c
index 99b6421da3..91166178db 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5344,6 +5344,7 @@ remote_get_thread_local_address (ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset)
       struct remote_state *rs = get_remote_state ();
       char *buf = alloca (rs->remote_packet_size);
       char *p = buf;
+      enum packet_result result;
 
       strcpy (p, "qGetTLSAddr:");
       p += strlen (p);
@@ -5356,13 +5357,21 @@ remote_get_thread_local_address (ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset)
 
       putpkt (buf);
       getpkt (buf, rs->remote_packet_size, 0);
-      if (packet_ok (buf, &remote_protocol_qGetTLSAddr) == PACKET_OK)
+      result = packet_ok (buf, &remote_protocol_qGetTLSAddr);
+      if (result == PACKET_OK)
 	{
 	  ULONGEST result;
 
 	  unpack_varlen_hex (buf, &result);
 	  return result;
 	}
+      else if (result == PACKET_UNKNOWN)
+	{
+	  struct exception e
+	    = { RETURN_ERROR, TLS_GENERIC_ERROR,
+		"Remote target doesn't support qGetTLSAddr packet" };
+	  throw_exception (e);
+	}
       else
 	{
 	  struct exception e