diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
index 7cac985f08..e343d6a70e 100644
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
@@ -1364,7 +1364,10 @@ begin
   CB := nil;
   try
     if FEvalFlags * [defNoTypeInfo, defSimpleTypeInfo, defFullTypeInfo] = [defNoTypeInfo] then
-      FreeAndNil(FResText);
+    begin
+      FResText := '';
+//      FreeAndNil(FResText);
+    end;
 
     if (FCallback <> nil) then begin
       // All to local vars, because SELF may be destroyed before/while the callback happens
diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 5d2cb49982..7c3d34f463 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -783,7 +783,7 @@ procedure TTreeNode.FreeAllNodeData;
 var
   i: Integer;
 begin
-  FreeAndNil(FData);
+  FreeAndNil(TObject(FData));
   for i:=0 to Count-1 do
     Items[i].FreeAllNodeData;
 end;