diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d178b0a3983..6daa36880eb 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27 Mikhail Khodjaiants
+	Check if the location of breakpoint is eligible for the target 
+	when setting, removing or changing the propeties.
+	* CDebugTarget.java
+
 2003-03-23 Alain Magloire
 
 	* src/org/eclipse/cdt/debug/core/cdi/model/type/ICDIVariable.java:
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 1f7e19bd16b..a26c42164c9 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -690,10 +690,8 @@ public class CDebugTarget extends CDebugElement
 	 */
 	public void breakpointAdded( IBreakpoint breakpoint )
 	{
-		if ( !isAvailable() )
-		{
+		if ( !isTargetBreakpoint( breakpoint ) || !isAvailable() )
 			return;
-		}
 		if ( getConfiguration().supportsBreakpoints() )
 		{
 			try
@@ -718,7 +716,6 @@ public class CDebugTarget extends CDebugElement
 			}
 			catch( DebugException e )
 			{
-//				CDebugCorePlugin.log( e );
 			}
 		}
 	}
@@ -728,6 +725,8 @@ public class CDebugTarget extends CDebugElement
 	 */
 	public void breakpointRemoved( IBreakpoint breakpoint, IMarkerDelta delta )
 	{
+		if ( !isTargetBreakpoint( breakpoint ) || !isAvailable() )
+			return;
 		try
 		{
 			if ( breakpoint instanceof CBreakpoint )
@@ -735,7 +734,6 @@ public class CDebugTarget extends CDebugElement
 		}
 		catch( DebugException e )
 		{
-			CDebugCorePlugin.log( e );
 		}
 	}
 
@@ -744,6 +742,8 @@ public class CDebugTarget extends CDebugElement
 	 */
 	public void breakpointChanged( IBreakpoint breakpoint, IMarkerDelta delta )
 	{
+		if ( !isTargetBreakpoint( breakpoint ) || !isAvailable() )
+			return;
 		try
 		{
 			if ( breakpoint instanceof CBreakpoint )
@@ -751,7 +751,6 @@ public class CDebugTarget extends CDebugElement
 		}
 		catch( DebugException e )
 		{
-			CDebugCorePlugin.log( e );
 		}
 	}