diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index fdb05618187..6566ff9cc89 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-25 Mikhail Khodjaiants
+	Bug 109733: Request to make certain methods as public (null check for setPrompt).
+	* RxThread.java
+
 2006-04-21 Mikhail Khodjaiants
 	Don't create pty when using gdbserver.
 	* AbstractGDBCDIDebugger.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
index a5041df0290..4cf20c68a7c 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
  *     Norbert Ploett, Siemens AG - fix for bug 119370
+ *     Hewlett-Packard Development Company - fix for bug 109733 (null check in setPrompt)
  *******************************************************************************/
 package org.eclipse.cdt.debug.mi.core;
 
@@ -129,14 +130,16 @@ public class RxThread extends Thread {
 	}
 
 	void setPrompt(String line) {
-		line = line.trim();
 		MIParser parser = session.getMIParser();
+		prompt = 0;
+		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=109733
+		if (line == null || parser == null)
+			return;
+		line = line.trim();
 		if (line.equals(parser.primaryPrompt)) {
 			prompt = 1;
 		} else if (line.equals(parser.secondaryPrompt)) {
 			prompt = 2;
-		} else {
-			prompt = 0;
 		}
 	}