diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 54bfc8df9..91ab04f87 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-20  Christopher Faylor  <cgf@timesys.com>
+
+	* path.cc (path_conv::check): Punt when attempting to access a
+	nonexistent directory or file in /proc.
+
 2005-04-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* security.cc (alloc_sd): Remove DELETE bit from user's ACE if
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 8c4f661d4..0baafb090 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -663,7 +663,8 @@ path_conv::check (const char *src, unsigned opt,
 		    break;
 		  default:
 		    fileattr = INVALID_FILE_ATTRIBUTES;
-		    goto virtual_component_retry;
+		    error = ENOENT;
+		    break;
 		}
 	      goto out;
 	    }