diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9cadc1541ad..a6917cb059e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23  Joel Brobecker  <brobecker@adacore.com>
+
+	* stack.c (do_gdb_disassembly): Print the exception message if an
+	error was thrown while trying to perform the disassembly.
+
 2009-04-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* varobj.c (free_variable): Replace free_current_contents by xfree.
diff --git a/gdb/stack.c b/gdb/stack.c
index f7bb81ecf1f..868111abab7 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -507,6 +507,10 @@ do_gdb_disassembly (int how_many, CORE_ADDR low, CORE_ADDR high)
     {
       gdb_disassembly_stub (&args);
     }
+  /* If an exception was thrown while doing the disassembly, print
+     the error message, to give the user a clue of what happened.  */
+  if (exception.reason == RETURN_ERROR)
+    exception_print (gdb_stderr, exception);
 }
 
 /* Print information about frame FRAME.  The output is format according