diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4f720329a2..5b042387c3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-22 22:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/thread.c
+    ! fixed GPF when hb_threadSelf() was executed from thread without
+      allocated ID object (f.e. main thread)
+
 2008-09-22 16:19 UTC-0300 Antonio Carlos Pantaglione <toninho@fwi.com.br>
   * harbour/contrib/rddads/ads1.c
     * using AdsCreateIndex61 when ADS_LIB_VERSION >= 610. This functions use 
diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c
index c10d5a18be..2af01d26ea 100644
--- a/harbour/source/vm/thread.c
+++ b/harbour/source/vm/thread.c
@@ -643,7 +643,8 @@ HB_FUNC( HB_THREADSELF )
 {
 #if defined( HB_MT_VM )
    PHB_THREADSTATE pThread = ( PHB_THREADSTATE ) hb_vmThreadState();
-   hb_itemReturn( pThread->pThItm );
+   if( pThread )
+      hb_itemReturn( pThread->pThItm );
 #endif
 }