diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
index 6e5067b95c5..c44b418b7c4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
@@ -133,6 +133,9 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
 	}
 
 	private void addBreakpointAnnotation(IBreakpoint breakpoint, boolean fireEvent) {
+		if (fDocument == null) {
+			return;
+		}
 		final IMarker marker= breakpoint.getMarker();
 		if (marker == null) {
 			return;