diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f49a641d4..edcad897d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-09  Christopher Faylor  <cgf@timesys.com>
+
+	* path.cc (mount): Only check win32_path when we know we need it.
+
 2005-07-09  Nicholas Wourms  <nwourms@gmail.com>
 
 	* cygwin.din (getline): Export.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index c62d70246..2a5ca4608 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2486,7 +2486,7 @@ mount (const char *win32_path, const char *posix_path, unsigned flags)
   myfault efault;
   if (efault.faulted (EFAULT))
     /* errno set */;
-  else if (!*posix_path || !*win32_path)
+  else if (!*posix_path)
     set_errno (EINVAL);
   else if (strpbrk (posix_path, "\\:"))
     set_errno (EINVAL);
@@ -2498,6 +2498,8 @@ mount (const char *win32_path, const char *posix_path, unsigned flags)
       res = mount_table->write_cygdrive_info_to_registry (posix_path, flags);
       win32_path = NULL;
     }
+  else if (!*win32_path)
+    set_errno (EINVAL);
   else
     res = mount_table->add_item (win32_path, posix_path, flags, true);