diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a1b25995cb..8c93e4dbc4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -25,6 +25,7 @@
     minor fixes.
   * include/set.h
     source/rtl/set.c
+    source/vm/hvm.c
     InitializeSets() -> hb_setInitialize()
     ReleaseSets() -> hb_setRelease()
   * types.h -> hbdefs.h
diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c
index 65aff798bc..a4580dbf7c 100644
--- a/harbour/source/rtl/errorapi.c
+++ b/harbour/source/rtl/errorapi.c
@@ -257,6 +257,7 @@ PHB_ITEM hb_errPutFlags( PHB_ITEM pError, USHORT uiFlags )
 WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, char* szOperation )
 {
    PHB_ITEM pError = hb_errNew();
+   WORD wRetVal;
 
    hb_errPutSeverity( pError, ES_ERROR );
    hb_errPutSubSystem( pError, HB_ERR_SS_BASE );
@@ -264,8 +265,11 @@ WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, cha
    hb_errPutSubCode( pError, ulSubCode );
    hb_errPutDescription( pError, szDescription );
    hb_errPutOperation( pError, szOperation );
-   hb_errLaunch( pError );
 
-   return hb_errRelease( pError );
+   wRetVal = hb_errLaunch( pError );
+
+   hb_errRelease( pError );
+
+   return wRetVal;
 }
 
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 4dc7bb9afa..dc0cc3d715 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -113,7 +113,6 @@ void LogSymbols( void );         /* displays all dynamic symbols */
 void ReleaseClasses( void );       /* releases all defined classes */
 void ReleaseLocalSymbols( void );  /* releases the memory of the local symbols linked list */
 void ReleaseDynamicSymbols( void ); /* releases the memory of the dynamic symbol table */
-void ReleaseSets( void ); /* releases Sets consumed memory */
 
 /* stack management functions */
 void StackPop( void );        /* pops an item from the stack */
@@ -197,7 +196,7 @@ BYTE bErrorLevel = 0;  /* application exit errorlevel */
    stack.Return.wType = IT_NIL;
    StackInit();
    NewDynSym( &symEval );  /* initialize dynamic symbol for evaluating codeblocks */
-   InitializeSets();       /* initialize Sets */
+   hb_setInitialize();     /* initialize Sets */
    InitializeConsole();    /* initialize Console */
 #ifdef HARBOUR_OBJ_GENERATION
    ProcessObjSymbols(); /* initialize Harbour generated OBJs symbols */
@@ -238,7 +237,7 @@ BYTE bErrorLevel = 0;  /* application exit errorlevel */
    ReleaseClasses();
    ReleaseLocalSymbols();       /* releases the local modules linked list */
    ReleaseDynamicSymbols();     /* releases the dynamic symbol table */
-   ReleaseSets();               /* releases Sets */
+   hb_setRelease();             /* releases Sets */
    StackFree();
    /* LogSymbols(); */
    HB_DEBUG( "Done!\n" );