diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1803f81c0be..7c436076ad8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-04  Joel Brobecker  <brobecker@adacorer.com>
+
+	PR server/17023
+	* mem-break.c (z_type_supported): Return zero if
+	THE_TARGET->SUPPORTS_Z_POINT_TYPE is NULL.
+
 2014-06-04  Tom Tromey  <tromey@redhat.com>
 
 	* ada-lang.c (ada_template_to_fixed_record_type_1): Use
diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index 71876f728ea..2ce3ab2f9b6 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -897,6 +897,7 @@ static int
 z_type_supported (char z_type)
 {
   return (z_type >= '0' && z_type <= '4'
+	  && the_target->supports_z_point_type != NULL
 	  && the_target->supports_z_point_type (z_type));
 }