diff --git a/debugger/debugger.pp b/debugger/debugger.pp
index 56d3844457..4f5d13fc82 100644
--- a/debugger/debugger.pp
+++ b/debugger/debugger.pp
@@ -5562,7 +5562,8 @@ function TDBGDisassembler.HandleRangeWithInvalidAddr(ARange: TDBGDisassemblerEnt
   AnAddr: TDbgPtr; var ALinesBefore, ALinesAfter: Integer): boolean;
 begin
   Result := False;
-  FEntryRanges.Delete(FCurrentRange.RangeStartAddr);
+  if ARange <> nil then
+    FEntryRanges.Delete(ARange.RangeStartAddr);
 end;
 
 constructor TDBGDisassembler.Create(const ADebugger: TDebugger);