diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 90322944f..6e37e6d91 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-04  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* cygcheck.cc (find_app_on_path): Avoid using NULL pointer if
+	find_on_path doesn't find the app on the path.
+
 2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
 
 	* Makefile.in: Add DESTDIR functionality.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index c3e9a953c..3b3860369 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -840,6 +840,9 @@ find_app_on_path (const char *app, bool showall = false)
 {
   const char *papp = find_on_path (app, ".exe", showall, false, true);
 
+  if (!papp)
+    return NULL;
+
   wide_path wpath (papp);
   HANDLE fh =
     CreateFileW (wpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,