diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b05cdec293..e2e10b3c1a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-29  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* tracepoint.c (start_tracing, stop_tracing): Checking for NULL
+	probes.
+
 2012-04-29  Yao Qi  <yao@codesourcery.com>
 
 	* gdb-code-style.el: New hook gdb-markup-hook
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index e5b57e1a926..6e47a0a7dee 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1783,7 +1783,8 @@ start_tracing (char *notes)
       t->number_on_target = b->number;
 
       for (loc = b->loc; loc; loc = loc->next)
-	loc->probe->pops->set_semaphore (loc->probe, loc->gdbarch);
+	if (loc->probe != NULL)
+	  loc->probe->pops->set_semaphore (loc->probe, loc->gdbarch);
     }
   VEC_free (breakpoint_p, tp_vec);
 
@@ -1878,7 +1879,8 @@ stop_tracing (char *note)
 	     but we don't really care if this semaphore goes out of sync.
 	     That's why we are decrementing it here, but not taking care
 	     in other places.  */
-	  loc->probe->pops->clear_semaphore (loc->probe, loc->gdbarch);
+	  if (loc->probe != NULL)
+	    loc->probe->pops->clear_semaphore (loc->probe, loc->gdbarch);
 	}
     }