diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2263134baf..d914aa3ac5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,10 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+    * removed ( commented ) setjmp/longjmp logic, because it caused GPF
+      when "DEFAULT" was pressed after getting an error.
+      It seems to me that __PreProcess() works right without setjmp/longjmp
+
 2002-03-14 14:00 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/rdd/dbfntx/dbfntx1.c
     ! bug fixed in seeking, reported by Mikhail Malyh
diff --git a/harbour/source/pp/ppcomp.c b/harbour/source/pp/ppcomp.c
index e1b85347f8..f1a439f386 100644
--- a/harbour/source/pp/ppcomp.c
+++ b/harbour/source/pp/ppcomp.c
@@ -119,7 +119,9 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
            char cQuote;
            int i;
 
-           if( !strncmp_nocase( s_szLine,"ENDTEXT",7 ) && *(s_szLine+7) <= ' ' )
+           ptr = s_szLine;
+           HB_SKIPTABSPACES( ptr );
+           if( !strncmp_nocase( ptr,"ENDTEXT",7 ) && *(ptr+7) <= ' ' )
            {
               hb_ppInsideTextBlock = FALSE;
               strcpy( s_szLine,"__TextRestore()" );