diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6484f164c..3437a2cd2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-05  Christopher Faylor  <cgf@redhat.com>
+
+	* dir.cc (opendir): Detect error return from build_fhandler_from_name.
+
 2001-12-04  David Rothenberger  <daveroth@acm.org>
 
 	* net.cc (cygwin_getsockopt): Dereference optlen pointer when passing
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 07d2ce6d9..5713c5767 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -82,13 +82,18 @@ opendir (const char *name)
 {
   fhandler_base *fh;
   path_conv pc;
-  DIR *res = NULL;
+  DIR *res;
 
   fh = cygheap->fdtab.build_fhandler_from_name (-1, name, NULL, pc,
 						PC_SYM_FOLLOW | PC_FULL, NULL);
-  res = fh->opendir (pc);
-  if (!res)
-    delete fh;
+  if (!fh)
+    res = NULL;
+  else
+    {
+      res = fh->opendir (pc);
+      if (!res)
+	delete fh;
+    }
   return res;
 }