diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 406411416..f41a66f3c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-16  Christopher Faylor  <cgf@timesys.com>
+
+	* pinfo.cc (pinfo::init): Guard against MapViewOfFileEx failure.
+
 2004-07-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mmap.cc (mmap_record::alloc_page_map): Mark pages as allocated even
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 79d4c60d4..f3a91754d 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -193,6 +193,8 @@ pinfo::init (pid_t n, DWORD flag, HANDLE in_h)
 	}
 
       procinfo = (_pinfo *) MapViewOfFileEx (h, access, 0, 0, 0, mapaddr);
+      if (!procinfo)
+	api_fatal ("MapViewOfFileEx failed, %E");
       ProtectHandle1 (h, pinfo_shared_handle);
 
       if ((procinfo->process_state & PID_INITIALIZING) && (flag & PID_NOREDIR)