diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index 63134d61e9..cc623632e2 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -2399,7 +2399,8 @@ HB_FUNC( __CLSGETPROPERTIES )
       {
          PHB_DYNS pMessage = ( PHB_DYNS ) pClass->pMethods[ uiAt ].pMessage;
 
-         if( pMessage && ( pClass->pMethods[ uiAt ].bIsPersistent == TRUE ) ) /* Hash Entry used ? */
+         if( ( pMessage != NULL ) &&
+             ( pClass->pMethods[ uiAt ].bIsPersistent == ( BOOL ) TRUE ) ) /* Hash Entry used ? */
          {
             PHB_ITEM pItem = hb_itemPutC( NULL, pMessage->pSymbol->szName );
                                                 /* Add to array */
@@ -2410,4 +2411,4 @@ HB_FUNC( __CLSGETPROPERTIES )
    }
 
    hb_itemRelease( hb_itemReturn( pReturn ) );
-}
+}
\ No newline at end of file