diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java
index 0782b9326a..89af511689 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/TraceObjectManager.java
@@ -403,19 +403,15 @@ public class TraceObjectManager {
 
 	public void addBreakpointContainer(TargetObject added) {
 		TargetObject obj = findThreadOrProcess(added);
-		if (obj != null) {
-			ManagedBreakpointRecorder breakpointRecorder = recorder.breakpointRecorder;
-			if (obj instanceof TargetThread) {
-				ManagedBreakpointRecorder rec =
-					recorder.getThreadRecorderForSuccessor(added).getBreakpointRecorder();
-				rec.offerBreakpointContainer((TargetBreakpointSpecContainer) added);
-				return;
-			}
-			breakpointRecorder.offerBreakpointContainer((TargetBreakpointSpecContainer) added);
-		}
-		else {
-			Msg.error(this, "Error recording breakpoint container " + added);
+		// NB. obj can be null
+		ManagedBreakpointRecorder breakpointRecorder = recorder.breakpointRecorder;
+		if (obj instanceof TargetThread) {
+			ManagedBreakpointRecorder rec =
+				recorder.getThreadRecorderForSuccessor(added).getBreakpointRecorder();
+			rec.offerBreakpointContainer((TargetBreakpointSpecContainer) added);
+			return;
 		}
+		breakpointRecorder.offerBreakpointContainer((TargetBreakpointSpecContainer) added);
 	}
 
 	public void removeBreakpointContainer(TargetObject removed) {