diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 869a468c22..3f41a19d80 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,10 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-06 08:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/hbgete.c
+    ! Fixed hb_setenv() to not crash on NULL szName parameter.
+    ! Fixed hb_setenv() to handle NULL szValue parameter on
+      win platforms.
+
 2010-05-05 15:50 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/resources/projectpropertiesex.ui
   * contrib/hbide/resources/projectpropertiesex.uic
-    
+
   * contrib/hbide/hbide.ch
   * contrib/hbide/ideenviron.prg
   * contrib/hbide/ideprojmanager.prg
@@ -28,11 +34,11 @@
     + Added: checkboxes to <Project Properties Dialog><Tab: General>
       to distinguish projects belonging to specific compiler.
       Current implementation passes "-xhb" switch to "hbMK2"
-      if "Xharbour" checkbox is checked. Other two options 
+      if "Xharbour" checkbox is checked. Other two options
       will be used in future.
 
-    + Implemented: {hbmk2} slot in hbide.env to fetch switches 
-      which necessarily have to be supplied to hbMK2 on the 
+    + Implemented: {hbmk2} slot in hbide.env to fetch switches
+      which necessarily have to be supplied to hbMK2 on the
       command-line only. A typical entry may look like this:
                [ BCC55  xHarbour ]
          {hbmk2}-ignore
@@ -51,11 +57,11 @@
     ! Removed: close button on "Stats" panel.
 
     + Implemented: line selection mode. Designated key is F11.
-      It is still a work in progress but a working prototype is there and 
+      It is still a work in progress but a working prototype is there and
       currently selection is available and paste behaves the standard way.
 
-      Mindagaus, please explore as the artifacts are OK. 
-     
+      Mindagaus, please explore as the artifacts are OK.
+
 2010-05-05 10:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/os2/gcc.mk
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/src/common/hbgete.c b/harbour/src/common/hbgete.c
index 49f08062b9..0ae6d376fd 100644
--- a/harbour/src/common/hbgete.c
+++ b/harbour/src/common/hbgete.c
@@ -197,12 +197,16 @@ HB_BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
  */
 HB_BOOL hb_setenv( const char * szName, const char * szValue )
 {
+   if( szName == NULL )
+      return HB_FALSE;
+
 #if defined( HB_OS_WIN )
    {
       LPTSTR lpName = HB_TCHAR_CONVTO( szName );
-      LPTSTR lpValue = HB_TCHAR_CONVTO( szValue );
+      LPTSTR lpValue = szValue ? HB_TCHAR_CONVTO( szValue ) : NULL;
       HB_BOOL bResult = ( SetEnvironmentVariable( lpName, lpValue ) != 0 );
-      HB_TCHAR_FREE( lpValue );
+      if( lpValue )
+         HB_TCHAR_FREE( lpValue );
       HB_TCHAR_FREE( lpName );
       return bResult;
    }