diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e25383b8d..200bbaadbf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-05  Jeff Holcomb  <jeffh@redhat.com>
+
+	* monitor.c (monitor_supply_register): Only report an error if we
+	don't get a valid value.
+
 2001-04-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* README: Don't mention gdba.el.
diff --git a/gdb/monitor.c b/gdb/monitor.c
index 78746b771d..e3a74dc920 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -906,7 +906,7 @@ monitor_supply_register (int regno, char *valstr)
     }
   monitor_debug ("Supplying Register %d %s\n", regno, valstr);
 
-  if (*p != '\0')
+  if (val == 0 && valstr == p)
     error ("monitor_supply_register (%d):  bad value from monitor: %s.",
 	   regno, valstr);