diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a8ed34b489..9ee6a50d24 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-15 02:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/debug/tbrwtext.prg
+    ! declare HBDebugger as friend class of HBBrwText to avoid scope
+      errors when debugger code executes some protected messages.
+      It will be better to clean debugger code but I do not have
+      time for it now.
+    ! use HBEditor() in edit mode to eliminate problems with cursor
+      positioning in source code window
+
+  * harbour/source/debug/debugger.prg
+    * added protection against RT error during macro evaluation of wrong
+      user expressions
+
 2008-05-14 20:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * contrib/rddads/adsfunc.c
      % Some optimizations and cleanups.
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 0ac0ae0ab3..32b34a561a 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -1178,6 +1178,7 @@ METHOD EditVar( nVar ) CLASS HBDebugger
    LOCAL uVarValue  := ::aVars[ nVar ][ 2 ]
    LOCAL cVarType   := ::aVars[ nVar ][ 3 ]
    LOCAL cVarStr
+   LOCAL oErr
 
    uVarValue := ::VarGetValue( ::aVars[ nVar ] )
 
@@ -1203,7 +1204,11 @@ METHOD EditVar( nVar ) CLASS HBDebugger
          __DbgObject( uVarValue, cVarName )
 
       OTHERWISE
-         ::VarSetValue( ::aVars[ nVar ], &cVarStr )
+         BEGIN SEQUENCE WITH {|oErr| break( oErr ) }
+            ::VarSetValue( ::aVars[ nVar ], &cVarStr )
+         RECOVER USING oErr
+            Alert( oErr:description )
+         END SEQUENCE
       ENDCASE
    ENDIF
 
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index 44362b884e..00e1b0bc66 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -96,6 +96,8 @@ CREATE CLASS HBBrwText INHERIT HBEditor
    METHOD Search( cString, lCaseSensitive, nMode ) // 0 from Begining to end, 1 Forward, 2 Backwards
    METHOD RowPos()
 
+   FRIEND CLASS HBDebugger
+
 ENDCLASS
 
 METHOD New( nTop, nLeft, nBottom, nRight, cFileName, cColor, lLineNumbers, nTabWidth ) CLASS HBBrwText
@@ -106,7 +108,7 @@ METHOD New( nTop, nLeft, nBottom, nRight, cFileName, cColor, lLineNumbers, nTabW
    ::cFileName := cFileName
    ::lLineNumbers := lLineNumbers
 
-   ::Super:New( "", nTop, nLeft, nBottom, nRight, .F., NIL, nTabWidth )
+   ::Super:New( "", nTop, nLeft, nBottom, nRight, .T., NIL, nTabWidth )
    ::Super:SetColor( cColor )
    ::Super:LoadFile( cFileName )