diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index c351d119c10..e10f4f341c4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -1386,7 +1386,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 				if (previousPos instanceof LabelPosition) {
 					revealOffset = previousPos.offset;
 					onTop = true;
-				} else if (!previousPos.fValid) {
+				} else if (previousPos == null || !previousPos.fValid) {
 					onTop = true;
 				}
 			} catch (BadLocationException e) {