diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
index 035a41991eb..7d2e4ed750c 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
@@ -483,9 +483,11 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
 	            for(Map.Entry<IBreakpoint, List<ITargetBreakpointInfo>> e: platformBPs.entrySet())
 	            {
 	                // Stop at the first occurrence
-	            	for (ITargetBreakpointInfo tbp : e.getValue())
-	            		if(tbp.getTargetBreakpoint().equals(bp))
+	            	for (ITargetBreakpointInfo tbp : e.getValue()) {
+                        IBreakpointDMContext targetBreakpoint = tbp.getTargetBreakpoint();
+                        if(targetBreakpoint != null && targetBreakpoint.equals(bp))
 	            			return e.getKey();
+                    }
 	            }    
 	        }
     	}