diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 62e76923a9..bf895de080 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-02 16:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/runner.c
+    ! fixed possible GPF after loading .hrb module - clear function
+      address if dynamic symbol does not exist
+
+  * harbour/source/compiler/hbmain.c
+    ! fixed typo in conditional compilation in last commit
+
 2009-09-02 14:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbcomp.h
   * harbour/include/hbcompdf.h
diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c
index e7f821bee4..f1630dd9be 100644
--- a/harbour/source/compiler/hbmain.c
+++ b/harbour/source/compiler/hbmain.c
@@ -4002,9 +4002,9 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, const char * szBuff
                hb_compExternGen( HB_COMP_PARAM );
          }
          else
-#else
-            HB_COMP_PARAM->iModulesCount = 1;
 #endif
+            HB_COMP_PARAM->iModulesCount = 1;
+
          HB_COMP_PARAM->currLine = 1;
          HB_COMP_PARAM->currModule = hb_compIdentifierNew(
                                     HB_COMP_PARAM, szFileName, HB_IDENT_COPY );
diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c
index 3f58457762..f6d03667de 100644
--- a/harbour/source/vm/runner.c
+++ b/harbour/source/vm/runner.c
@@ -461,6 +461,8 @@ static PHRB_BODY hb_hrbLoad( const char * szHrbBody, ULONG ulBodySize, USHORT us
          /* External function */
          if( pSymRead[ ul ].value.pCodeFunc == ( PHB_PCODEFUNC ) SYM_EXTERN )
          {
+            pSymRead[ ul ].value.pCodeFunc = NULL;
+
             pDynSym = hb_dynsymFind( pSymRead[ ul ].szName );
 
             if( pDynSym )