diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a64706dae0..00b8cbcfcf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-26  Pedro Alves  <pedro@codesourcery.com>
+	    Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c (trace_dump_command): GDB emits an error
+	 instead of a warning when a traceframe is not selected.
+
 2013-06-26  Pedro Alves  <pedro@codesourcery.com>
 	    Yao Qi  <yao@codesourcery.com>
 
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 9646090ef3..05f51ea428 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2982,10 +2982,7 @@ trace_dump_command (char *args, int from_tty)
   struct cleanup *old_chain;
 
   if (tracepoint_number == -1)
-    {
-      warning (_("No current trace frame."));
-      return;
-    }
+    error (_("No current trace frame."));
 
   old_chain = make_cleanup (null_cleanup, NULL);
   t = get_tracepoint (tracepoint_number);