diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3c6296ed2..1f824a391 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-06  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* dtable.cc (handle_to_fn): Detect failing NtQueryObject.
+
 2009-07-06  Corinna Vinschen  <corinna@vinschen.de>
 
 	* autoload.cc: Delete stray CR.
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 08b04f091..22303dfde 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -891,8 +891,9 @@ handle_to_fn (HANDLE h, char *posix_fn)
   WCHAR *maxmatchdos = NULL;
   int maxmatchlen = 0;
 
-  NtQueryObject (h, ObjectNameInformation, &dummy_oni, sizeof (dummy_oni), &len);
-  if (!len)
+  NTSTATUS status = NtQueryObject (h, ObjectNameInformation, &dummy_oni,
+				   sizeof (dummy_oni), &len);
+  if (!NT_SUCCESS (status) || !len)
     debug_printf ("NtQueryObject failed 1");
   else
     {