diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c754c2140c..82e7129608 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2002-11-02 11:55 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/rdd/dbcmd.c
+    ! hb_rddGetCurrentWorkAreaPointer() fixed as proposed Jacek Potempa
+
 2002-10-31 16:40 UTC-0300 Walter Negro <anegro@overnet.com.ar>
   * source/rtl/tget.prg
     ! Fix ::DeleteEnd() method.
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index 4be79301a5..271783eefd 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -781,7 +781,7 @@ void * hb_rddGetCurrentWorkAreaPointer( void )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_rddGetCurrentWorkAreaPointer()"));
 
-   return s_pCurrArea->pArea;
+   return ( s_pCurrArea )? s_pCurrArea->pArea:NULL;
 }
 
 /*