diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6e3e3aaf13..4b98482d29 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-30 15:39 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/harbour.y
+  * harbour/source/compiler/harbour.yyc
+    ! fixed wrongly hidden error message - it was causing memory leak
+      Thanks to Roberto for information.
+
 2008-07-30 11:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * doc/dirstruc.txt
      * Some (incomplete) updates to the dir structure layout.
diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y
index 6b4970c558..7329880cf8 100644
--- a/harbour/source/compiler/harbour.y
+++ b/harbour/source/compiler/harbour.y
@@ -2823,7 +2823,7 @@ void yyerror( HB_COMP_DECL, char * s )
 {
    if( !HB_COMP_PARAM->pLex->lasttok || HB_COMP_PARAM->pLex->lasttok[ 0 ] == '\n' )
    {
-      if( ! hb_pp_eof( HB_COMP_PARAM->pLex->pPP ) )
+      if( HB_COMP_PARAM->iErrorCount == 0 || !hb_pp_eof( HB_COMP_PARAM->pLex->pPP ) )
          hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_INCOMPLETE_STMT, NULL, NULL );
    }
    else
diff --git a/harbour/source/compiler/harbour.yyc b/harbour/source/compiler/harbour.yyc
index 8f3b38dbb6..7666b33694 100644
--- a/harbour/source/compiler/harbour.yyc
+++ b/harbour/source/compiler/harbour.yyc
@@ -8160,7 +8160,7 @@ void yyerror( HB_COMP_DECL, char * s )
 {
    if( !HB_COMP_PARAM->pLex->lasttok || HB_COMP_PARAM->pLex->lasttok[ 0 ] == '\n' )
    {
-      if( ! hb_pp_eof( HB_COMP_PARAM->pLex->pPP ) )
+      if( HB_COMP_PARAM->iErrorCount == 0 || !hb_pp_eof( HB_COMP_PARAM->pLex->pPP ) )
          hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_INCOMPLETE_STMT, NULL, NULL );
    }
    else