diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index fd8bf582962..bd121da62b9 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-26 Mikhail Khodjaiants
+	Fix for bug 79608: NPE in CValue.
+	* CValue.java
+
 2004-11-26 Mikhail Khodjaiants
 	Fix for bug 79377: "Mixed disassembly" should fall back to disassembly w/o source when mixed disassembly fails.
 	* Disassembly.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
index 24cd003601b..7b9308aa217 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
@@ -364,7 +364,7 @@ public class CValue extends AbstractCValue {
 		BigInteger pv = value.pointerValue();
 		if ( pv == null )
 			return ""; //$NON-NLS-1$
-		IAddress address = factory.createAddress( value.pointerValue() );
+		IAddress address = factory.createAddress( pv );
 		if ( address == null )
 			return ""; //$NON-NLS-1$
 		CVariableFormat format = getParentVariable().getFormat();