diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 23085b6c626..f56fb412007 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-16 Alain Magloire
+	NPE when watchpoints are set in the gdb console.
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+
 2004-11-16 Alain Magloire
 	Do not check for isEnable() when changing condition.
 	* cdi/org/eclipse/cdt/debug/mi/core/cdi/mode/Breakpoint.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
index 2228842e024..25bf34d6b24 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
@@ -366,6 +366,7 @@ public class BreakpointManager extends Manager {
 						watchType &= ICDIWatchpoint.WRITE;
 					}
 					Watchpoint wpoint = new Watchpoint(target, allMIBreakpoints[i].getWhat(), type, watchType, condition);
+					wpoint.setMIBreakpoints(new MIBreakpoint[] {allMIBreakpoints[i]});
 					bList.add(wpoint);
 				} else {
 					Location location = new Location (allMIBreakpoints[i].getFile(),
@@ -641,7 +642,7 @@ public class BreakpointManager extends Manager {
 					try {
 						miSession.postCommand(breakDisable);
 						MIInfo disableInfo = breakDisable.getMIInfo();
-						if (info == null) {
+						if (disableInfo == null) {
 							throw new CDIException(CdiResources.getString("cdi.Common.No_answer")); //$NON-NLS-1$
 						}
 					} catch (MIException e) {