diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2a727642c..5608e1e2f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-23  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_console.cc (fhandler_console::fixup_after_fork_exec): Make
+	error message more explicit.
+	* pinfo.cc (_pinfo::commune_request): Don't lock process unless we're
+	looking for fifos.
+
 2006-03-23  Christopher Faylor  <cgf@timesys.com>
 
 	* dcrt0.cc (child_info_spawn::handle_spawn): Don't initialize the
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 23f2cf8e7..801ab5a6a 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1804,12 +1804,12 @@ fhandler_console::fixup_after_fork_exec (bool execing)
       bool sawerr = false;
       if (!get_io_handle ())
 	{
-	  system_printf ("error opening input console handle after fork/exec, errno %d, %E", get_errno ());
+	  system_printf ("error opening input console handle for %s after fork/exec, errno %d, %E", get_name (), get_errno ());
 	  sawerr = true;
 	}
       if (!get_output_handle ())
 	{
-	  system_printf ("error opening output console handle after fork/exec, errno %d, %E", get_errno ());
+	  system_printf ("error opening output console handle for %s after fork/exec, errno %d, %E", get_name (), get_errno ());
 	  sawerr = true;
 	}
 
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 6c9cdab16..8aeaa64bb 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -603,7 +603,6 @@ _pinfo::commune_request (__uint32_t code, ...)
     break;
     }
 
-  lock_process now ();
   locked = true;
   char name_buf[CYG_MAX_PATH];
   request_sync = CreateSemaphore (&sec_none_nih, 0, LONG_MAX,
@@ -652,6 +651,7 @@ _pinfo::commune_request (__uint32_t code, ...)
       break;
     case PICOM_FIFO:
       {
+	lock_process now ();
 	DWORD x = ReadFile (fromthem, res.handles, sizeof (res.handles), &nr, NULL);
 	if (!x || nr != sizeof (res.handles))
 	  {