diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index eb72c417b..7b6ae0478 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-02  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* strace.cc (strace::vprntf): Avoid closing unopened handle.
+
 2011-05-02  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* sysconf.cc (sca): Set _SC_SPIN_LOCKS to _POSIX_SPIN_LOCKS.
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 64999831e..19b6e5050 100644
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -254,8 +254,10 @@ strace::vprntf (unsigned category, const char *func, const char *fmt, va_list ap
 				 FILE_SHARE_WRITE | FILE_SHARE_WRITE,
 				 &sec_none, OPEN_EXISTING, 0, 0);
 	  if (h != INVALID_HANDLE_VALUE)
-	    WriteFile (h, buf, len, &done, 0);
-	  CloseHandle (h);
+	    {
+	      WriteFile (h, buf, len, &done, 0);
+	      CloseHandle (h);
+	    }
 	}
     }