diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 934dfbce3b3..6a6fa646800 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-28 Mikhail Khodjaiants
+	Check if part is not null when set the selection.
+	* AddExpressionActionDelegate.java
+	* AddGlobalsActionDelegate.java
+	* JumpToLineActionDelegate.java
+	* RunToLineActionDelegate.java
+
 2003-02-28 Mikhail Khodjaiants
 	Check if page exists before adding a listener.
 	* AbstractListenerActionDelegate.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
index 01f725a4700..4d37c2894e9 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
@@ -108,9 +108,9 @@ public class AddExpressionActionDelegate extends AbstractEditorActionDelegate
 	public void selectionChanged( IWorkbenchPart part, ISelection selection )
 	{
 		IDebugTarget target = null;
-		if ( part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
+		if ( part != null && part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
 		{
-			if ( selection != null && selection instanceof IStructuredSelection )
+			if ( selection instanceof IStructuredSelection )
 			{
 				Object element = ((IStructuredSelection)selection).getFirstElement();
 				if ( element != null && element instanceof IDebugElement )
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
index 6600930da97..55a9be6975b 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java
@@ -110,7 +110,7 @@ public class AddGlobalsActionDelegate implements IViewActionDelegate,
 	 */
 	public void selectionChanged( IWorkbenchPart part, ISelection selection )
 	{
-		if ( part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
+		if ( part != null && part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
 		{
 			if ( selection instanceof IStructuredSelection )
 			{
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/JumpToLineActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/JumpToLineActionDelegate.java
index ef58f89f4c2..3f86b65724e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/JumpToLineActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/JumpToLineActionDelegate.java
@@ -50,9 +50,9 @@ public class JumpToLineActionDelegate extends AbstractEditorActionDelegate
 	public void selectionChanged( IWorkbenchPart part, ISelection selection )
 	{
 		IDebugTarget target = null;
-		if ( part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
+		if ( part != null && part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
 		{
-			if ( selection != null && selection instanceof IStructuredSelection )
+			if ( selection instanceof IStructuredSelection )
 			{
 				Object element = ((IStructuredSelection)selection).getFirstElement();
 				if ( element != null && element instanceof IDebugElement )
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java
index e73b2569582..8eb9ef2aec0 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineActionDelegate.java
@@ -108,9 +108,9 @@ public class RunToLineActionDelegate extends AbstractEditorActionDelegate
 	public void selectionChanged( IWorkbenchPart part, ISelection selection )
 	{
 		IDebugTarget target = null;
-		if ( part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
+		if ( part != null && part.getSite().getId().equals( IDebugUIConstants.ID_DEBUG_VIEW ) )
 		{
-			if ( selection != null && selection instanceof IStructuredSelection )
+			if ( selection instanceof IStructuredSelection )
 			{
 				Object element = ((IStructuredSelection)selection).getFirstElement();
 				if ( element != null && element instanceof IDebugElement )