diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 814a336842..81ec47a456 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-01  Stan Shebs  <stan@codesourcery.com>
+
+	* tracepoint.c (trace_start_command): Confirm if trace is running.
+	(trace_stop_command): Error if trace not running.
+
 2010-04-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* amd64-tdep.c (amd64_byte_names): Add "ah", "bh", "ch", "dh".
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index f82e05e8c0..14fcbc58fe 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1576,6 +1576,13 @@ trace_start_command (char *args, int from_tty)
 {
   dont_repeat ();	/* Like "run", dangerous to repeat accidentally.  */
 
+  if (current_trace_status ()->running)
+    {
+      if (from_tty
+	  && !query (_("A trace is running already.  Start a new run? ")))
+	error (_("New trace run not started."));
+    }
+
   start_tracing ();
 }
 
@@ -1583,6 +1590,9 @@ trace_start_command (char *args, int from_tty)
 static void
 trace_stop_command (char *args, int from_tty)
 {
+  if (!current_trace_status ()->running)
+    error (_("Trace is not running."));
+
   stop_tracing ();
 }