diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 933c9007a..42c0604d1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-14  Christopher Faylor  <cgf@redhat.com>
+
+	* uinfo.cc (cygheap_user::ontherange): Don't set HOMEDRIVE or HOMEPATH
+	unless one or the other is specified.
+
 2002-06-14  Christopher Faylor  <cgf@redhat.com>
 
 	* cygheap.h (cygheap_user::userprofile_env_buf): New static member.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index e20c4b704..eeec27566 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -234,6 +234,7 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
 	      debug_printf ("Set HOME (from HOMEDRIVE/HOMEPATH) to %s", home);
 	    }
 	}
+      return NULL;
     }
 
   if (homedrive == NULL || !homedrive[0])