diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 884cf2c5a01..8237ba33c51 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-04  J. Brobecker  <brobecker@gnat.com>
+
+	* hppa-tdep.c (hppa_frame_cache): Avoid undefined return value.
+
 2004-03-04  Daniel Jacobowitz  <drow@mvista.com>
 
 	* dwarf2read.c: Add comment describing memory lifetimes.
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index ccbdcba21c8..549a81127f2 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -4617,7 +4617,7 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache)
   /* Yow! */
   u = find_unwind_entry (frame_func_unwind (next_frame));
   if (!u)
-    return;
+    return (*this_cache);
 
   /* Turn the Entry_GR field into a bitmask.  */
   saved_gr_mask = 0;