diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 400848ee1d9..05891aa8dfe 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-01 Mikhail Khodjaiants
+	Partial fix for bug 77444: CDT does not handle address breakpoints across sessions.
+	* CBreakpointManager.java
+	
 2004-12-01 Mikhail Khodjaiants
 	Fix for bug 80034: Expressions view does not display correct no. of elements in array.
 	* CValueFactory.java
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 50c5eab4d2c..1220888a711 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
@@ -278,7 +278,9 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
 					ICDILocation location = ((ICDILocationBreakpoint)cdiBreakpoint).getLocation();
 					if ( location != null ) {
 						IAddressFactory factory = getDebugTarget().getAddressFactory();
-						return factory.createAddress( location.getAddress() );
+						BigInteger address = location.getAddress();
+						if ( address != null )
+							return factory.createAddress( address );
 					}	
 				}
 				catch( CDIException e ) {