diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java
index 32603b82d5a..dce4b3d4e55 100644
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java
+++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java
@@ -71,7 +71,7 @@ public class SelectionRegressionTest extends BaseTestFramework {
     	suite.addTest( new SelectionRegressionTest( "testMethod" ) ); //$NON-NLS-1$
     	suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethodRHS78656" ), 78656 )); //$NON-NLS-1$
     	suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethod78114" ), 78114 )); //$NON-NLS-1$
-    	suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethod78118" ), 78118 )); //$NON-NLS-1$
+    	suite.addTest( new SelectionRegressionTest( "testMethod78118" ) ); //$NON-NLS-1$
     	suite.addTest( new FailingTest( new SelectionRegressionTest( "testOverloadedMethod78389" ), 78389 )); //$NON-NLS-1$
     	suite.addTest( new FailingTest( new SelectionRegressionTest( "testConstructor78625" ), 78625) ); //$NON-NLS-1$
     	suite.addTest( new SelectionRegressionTest( "testClassField" ) ); //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
index cd29040573a..8397dda9a2b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
@@ -6648,7 +6648,7 @@ public class Parser implements IParserData, IParser
 			// duple is prefix of greaterContextDuple
 			// or duple is suffix of greaterContextDuple
 			// duple is a sub-duple of greaterContextDuple
-			if( duple.getFirstToken().equals( greaterContextDuple.getFirstToken() ))
+			if( greaterContextDuple == null || duple.getFirstToken().equals( greaterContextDuple.getFirstToken() ))
 				finalDuple = duple; //	=> do not use greaterContextDuple
 			else if( duple.getLastSegment().getFirstToken().equals( greaterContextDuple.getLastSegment().getFirstToken() ))
 				finalDuple = greaterContextDuple; //  => use greaterContextDuple