diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 6678fa1f262..28f61f069f9 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-28 Mikhail Khodjaiants
+	Bug 103567: breakpoints view of of sync w/CDT CVS HEAD
+	* CBreakpointManager.java
+
 2005-07-26 Mikhail Khodjaiants
 	Bug 105224: Two identical directory source container types.
 	* plugin.properties
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 00c2f30d9dd..f018520f9dc 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
@@ -228,8 +228,11 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 		ArrayList list = new ArrayList( breakpoints.length );
 		synchronized( getBreakpointMap() ) {
 			for ( int i = 0; i < breakpoints.length; ++i ) {
-				if ( breakpoints[i] instanceof ICBreakpoint && !getBreakpointMap().isInProgress( (ICBreakpoint)breakpoints[i] ) )
-					list.add( getBreakpointMap().getCDIBreakpoint( (ICBreakpoint)breakpoints[i] ) );			
+				if ( breakpoints[i] instanceof ICBreakpoint && !getBreakpointMap().isInProgress( (ICBreakpoint)breakpoints[i] ) ) {
+					ICDIBreakpoint b = getBreakpointMap().getCDIBreakpoint( (ICBreakpoint)breakpoints[i] );
+					if ( b != null )
+						list.add( b );
+				}
 			}
 		}
 		if ( list.isEmpty() )