diff --git a/ide/dialogprocs.pas b/ide/dialogprocs.pas
index a389a8eaba..dd9a01c9a7 100644
--- a/ide/dialogprocs.pas
+++ b/ide/dialogprocs.pas
@@ -38,7 +38,8 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, LResources, Forms, Controls, Dialogs, FileUtil,
-  CodeCache, CodeToolManager, AVL_Tree, LazIDEIntf,
+  CodeCache, CodeToolManager, AVL_Tree,
+  LazIDEIntf,
   IDEProcs, LazarusIDEStrConsts, IDEDialogs;
 
 type
diff --git a/ide/main.pp b/ide/main.pp
index 20990a0c75..cfbe3e96d7 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -5424,6 +5424,7 @@ begin
     NewSrcEdit.EditorComponent.BeginUpdate;
     NewSrcEdit.CodeBuffer:=AnUnitInfo.Source;
     AnUnitInfo.ClearModifieds;
+    DebugLn(['TMainIDE.DoOpenFileInSourceEditor NewCaretXY=',dbgs(NewCaretXY),' NewTopLine=',NewTopLine]);
   end;
 
   // update editor indices in project
@@ -5866,6 +5867,7 @@ var
   FilenameNoPath: String;
   LoadBufferFlags: TLoadBufferFlags;
   DiskFilename: String;
+  NewSrcEdit: TSourceEditor;
 
   function OpenResource: TModalResult;
   begin
@@ -6047,7 +6049,11 @@ begin
       if ofRevert in Flags then
         Include(LoadBufferFlags,lbfRevert);
     end;
+    NewSrcEdit:=SourceNotebook.FindSourceEditorWithPageIndex(PageIndex);
+    if NewSrcEdit<>nil then DebugLn(['TMainIDE.DoOpenEditorFile AAA ',AFilename,' TopLine=',NewSrcEdit.EditorComponent.TopLine]);
     Result:=LoadCodeBuffer(NewBuf,AFileName,LoadBufferFlags);
+    NewSrcEdit:=SourceNotebook.FindSourceEditorWithPageIndex(PageIndex);
+    if NewSrcEdit<>nil then DebugLn(['TMainIDE.DoOpenEditorFile BBB ',AFilename,' TopLine=',NewSrcEdit.EditorComponent.TopLine]);
     if Result<>mrOk then begin
       DebugLn(['TMainIDE.DoOpenEditorFile failed LoadCodeBuffer: ',AFilename]);
       exit;
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index d43daf5f05..e62b8c5542 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -2108,9 +2108,9 @@ procedure TSourceEditor.OnCodeBufferChanged(Sender: TSourceLog;
 
 var StartPos, EndPos, MoveToPos: TPoint;
 begin
-{$IFDEF IDE_DEBUG}
-writeln('[TSourceEditor.OnCodeBufferChanged] A ',FIgnoreCodeBufferLock,' ',SrcLogEntry<>nil);
-{$ENDIF}
+  { $IFDEF IDE_DEBUG}
+  writeln('[TSourceEditor.OnCodeBufferChanged] A ',FIgnoreCodeBufferLock,' ',SrcLogEntry<>nil);
+  { $ENDIF}
   if FIgnoreCodeBufferLock>0 then exit;
   if SrcLogEntry<>nil then begin
     FEditor.BeginUpdate;
diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp
index 382c1ef7b3..7199b946bc 100644
--- a/ideintf/objectinspector.pp
+++ b/ideintf/objectinspector.pp
@@ -899,7 +899,7 @@ procedure TOICustomPropertyGrid.Notification(AComponent: TComponent;
 var
   i: LongInt;
 begin
-  if Operation=opRemove then begin
+  if (Operation=opRemove) and (FNotificationComponents<>nil) then begin
     FNotificationComponents.Remove(AComponent);
     i:=FSelection.IndexOf(AComponent);
     if i>=0 then begin
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index d85911795d..c61929d9e7 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -2490,7 +2490,7 @@ begin
   Result:=mrOk;
   if (OldFilename=NewFilename) then
     exit;
-  debugln('TPkgManager.OnRenameFile A OldFilename="',OldFilename,'" New="',NewFilename,'"');
+  //debugln('TPkgManager.OnRenameFile A OldFilename="',OldFilename,'" New="',NewFilename,'"');
   OldPkgFile:=PackageGraph.FindFileInAllPackages(OldFilename,false,true,
                                                  not IsPartOfProject);
   if (OldPkgFile=nil) or (OldPkgFile.LazPackage.ReadOnly) then