diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1ed49672e..4f91ce8c4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* dir.cc (opendir): Call set_unique_id only with valid fh.
+
 2014-01-30  Christopher Faylor  <me.cygwin2014@cgf.cx>
 
 	* fhandler.h (cltype): Add cl_buf_beg, cl_buf_end.
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index dc6e2a740..c1f8a897b 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -1,7 +1,7 @@
 /* dir.cc: Posix directory-related routines
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -69,7 +69,7 @@ opendir (const char *name)
   if (!res && fh)
     delete fh;
   /* Applications calling flock(2) on dirfd(fd) need this... */
-  if (!fh->nohandle ())
+  if (res && !fh->nohandle ())
     fh->set_unique_id ();
   return res;
 }