diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index f088e3fa3d4..c8c1e815a18 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-12 Mikhail Khodjaiants
+	Bug 100447: NPE generated when Run To Line in Disassembly view.
+	* ResumeAtLineAdapter.java
+	* RunToLineAdapter.java
+
 2005-06-12 Mikhail Khodjaiants
 	Temporary fix for bug 79872: Make instruction stepping default in disassembly view.
 	* DisassemblyView.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java
index fb7bfea430c..f15487b7fab 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java
@@ -93,7 +93,7 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget {
 				ITextSelection textSelection = (ITextSelection)selection;
 				int lineNumber = textSelection.getStartLine() + 1;
 				final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
-				if ( target instanceof IAdaptable ) {
+				if ( address != null && target instanceof IAdaptable ) {
 					final IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)target).getAdapter( IJumpToAddress.class );
 					if ( jumpToAddress != null && jumpToAddress.canJumpToAddress( address ) ) {
 						Runnable r = new Runnable() {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java
index 708015a2383..5daf3ed0c2d 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java
@@ -96,7 +96,7 @@ public class RunToLineAdapter implements IRunToLineTarget {
 				ITextSelection textSelection = (ITextSelection)selection;
 				int lineNumber = textSelection.getStartLine() + 1;
 				final IAddress address = ((DisassemblyEditorInput)input).getAddress( lineNumber );
-				if ( target instanceof IAdaptable ) {
+				if ( address != null && target instanceof IAdaptable ) {
 					final IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter( IRunToAddress.class );
 					if ( runToAddress != null && runToAddress.canRunToAddress( address ) ) {
 						Runnable r = new Runnable() {