diff --git a/sysdeps/kernel/ChangeLog b/sysdeps/kernel/ChangeLog
index da20dba0..d486efc7 100644
--- a/sysdeps/kernel/ChangeLog
+++ b/sysdeps/kernel/ChangeLog
@@ -1,3 +1,13 @@
+1999-12-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* procdata.c (glibtop_get_proc_data_proc_state_s): Return
+	-GLIBTOP_ERROR_NO_SUCH_PROCESS if the process doesn't exist.
+	(glibtop_get_proc_data_proc_mem_s): Likewise.
+	(glibtop_get_proc_data_proc_signal_s): Likewise.
+	(glibtop_get_proc_data_proc_kernel_s): Likewise.
+	(glibtop_get_proc_data_proc_args_s): Likewise.
+	(glibtop_get_proc_data_proc_maps_s): Likewise.
+
 1999-04-09  Martin Baulig  <martin@home-of-linux.org>
 
 	* sysinfo.c: Copied from the Linux sysdeps directory.
diff --git a/sysdeps/kernel/procdata.c b/sysdeps/kernel/procdata.c
index 02aae052..a1340320 100644
--- a/sysdeps/kernel/procdata.c
+++ b/sysdeps/kernel/procdata.c
@@ -92,7 +92,10 @@ glibtop_get_proc_data_proc_state_s (glibtop *server,
     size_t size = sizeof (libgtop_proc_state_t);
 
     if (sysctl (name, 3, proc_state, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_state)");
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_state)");
 	return -1;
     }
 
@@ -108,7 +111,10 @@ glibtop_get_proc_data_proc_mem_s (glibtop *server,
     size_t size = sizeof (libgtop_proc_mem_t);
 
     if (sysctl (name, 3, proc_mem, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_mem)");
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_mem)");
 	return -1;
     }
 
@@ -124,7 +130,10 @@ glibtop_get_proc_data_proc_signal_s (glibtop *server,
     size_t size = sizeof (libgtop_proc_signal_t);
 
     if (sysctl (name, 3, proc_signal, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_signal)");
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_signal)");
 	return -1;
     }
 
@@ -140,7 +149,10 @@ glibtop_get_proc_data_proc_kernel_s (glibtop *server,
     size_t size = sizeof (libgtop_proc_kernel_t);
 
     if (sysctl (name, 3, proc_kernel, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_kernel)");
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_kernel)");
 	return -1;
     }
 
@@ -155,7 +167,10 @@ glibtop_get_proc_data_proc_args_s (glibtop *server, pid_t pid,
     size_t size = max_len;
 
     if (sysctl (name, 3, result, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_args)");
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_args)");
 	return -1;
     }
 
@@ -171,8 +186,10 @@ glibtop_get_proc_data_proc_maps_s (glibtop *server, pid_t pid,
     size_t size = max_len;
 
     if (sysctl (name, 3, result, &size, NULL, 0)) {
-	glibtop_warn_io_r (server, "sysctl (libgtop/proc_maps)");
-	fprintf (stderr, "retval: %d\n", size);
+	if (errno == ENOTDIR)
+	    return -GLIBTOP_ERROR_NO_SUCH_PROCESS;
+	else
+	    glibtop_warn_io_r (server, "sysctl (libgtop/proc_maps)");
 	return -1;
     }