diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
index 54803418c55..872c1a9cd0f 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
@@ -444,9 +444,11 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 		ICBreakpoint breakpoint = null;
 		synchronized( getBreakpointMap() ) {
 			breakpoint = getBreakpointMap().getCBreakpoint( cdiBreakpoint );
-			if ( breakpoint == null ) {
-				breakpoint = createLocationBreakpoint( cdiBreakpoint );
-			}
+		}
+		if ( breakpoint == null ) {
+			breakpoint = createLocationBreakpoint( cdiBreakpoint );
+		}
+		synchronized( getBreakpointMap() ) {
 			if ( breakpoint != null )
 				getBreakpointMap().put( breakpoint, cdiBreakpoint );
 		}