diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 39a50f3c506..e3f39065ebc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* stack.c (select_frame): Cleanup internal error message, do not
+	use %p.
+
 2002-04-10  Andrew Cagney  <ac131313@redhat.com>
 
 	* stack.c (select_frame): Check that selected_frame and the
diff --git a/gdb/stack.c b/gdb/stack.c
index a348934b480..6a26e9a419c 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1488,8 +1488,9 @@ select_frame (struct frame_info *fi, int level)
     ;
   else
     internal_error (__FILE__, __LINE__,
-		    "oops! fi=0x%p, fi->level=%d, level=%d",
-		    fi, fi ? fi->level : -1, level);
+		    "Conflicting frame levels fi->level=%d, level=%d",
+		    (fi ? fi->level : -1),
+		    level);
   if (selected_frame_level_changed_hook)
     selected_frame_level_changed_hook (level);