diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 9fc189e5b2f..fd679ac255f 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-29 Mikhail Khodjaiants
+	Added new error status handler.
+	* plugin.xml
+	* ErrorStatusHandler.java
+
 2004-01-22 Alain Magloire
 
 	Set the sharedLibManager autorefresh to be off by defaul
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 47083faee2e..008e2689403 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1172,6 +1172,12 @@
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
+      <statusHandler
+            plugin="org.eclipse.cdt.debug.core"
+            code="5010"
+            class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
+            id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
+      </statusHandler>
    </extension>
    <extension
          point="org.eclipse.debug.ui.debugActionGroups">
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java
index 417a4f57999..53df4c81ad2 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java
@@ -9,7 +9,9 @@ import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.debug.core.IStatusHandler;
+import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
+import org.eclipse.debug.core.model.IThread;
 import org.eclipse.jface.dialogs.ErrorDialog;
 
 /**
@@ -26,9 +28,10 @@ public class ErrorStatusHandler implements IStatusHandler
 	 */
 	public Object handleStatus( final IStatus status, Object source ) throws CoreException
 	{
-		if ( status != null && source != null && source instanceof IDebugTarget )
+		if ( status != null && (source instanceof IDebugTarget || source instanceof IThread ) )
 		{
-			final String title = ((IDebugTarget)source).getName();
+			IDebugTarget target = ((IDebugElement)source).getDebugTarget();
+			final String title = target.getName();
 			CDebugUIPlugin.getStandardDisplay().asyncExec(
 					new Runnable()
 						{