diff --git a/ChangeLog.txt b/ChangeLog.txt
index bed7485bc7..64cc407e0b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,11 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2023-07-07 00:07 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/vm/classes.c
+    ! fixed GPF when object item variable is passed by reference but the object
+      is neither instance of standard class nor scalar class
+
 2023-05-19 16:29 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbclass.ch
     ! fixed declaration stripping when HB_CLS_NO_DECLARATIONS is defined
diff --git a/src/vm/classes.c b/src/vm/classes.c
index 1fd9f2c92b..6247c6a9e8 100644
--- a/src/vm/classes.c
+++ b/src/vm/classes.c
@@ -2269,7 +2269,7 @@ HB_BOOL hb_objGetVarRef( PHB_ITEM pObject, PHB_SYMB pMessage,
       {
          pExecSym->value.pFunPtr();
       }
-      else
+      else if( pStack->uiClass )
       {
          PCLASS pClass   = s_pClasses[ pStack->uiClass ];
          PMETHOD pMethod = pClass->pMethods + pStack->uiMethod;