diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
index bcc1eef6ce0..e27fac2b5d0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
@@ -137,6 +137,31 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
 						ITextEditor textEditor= (ITextEditor) editorPart;
 						textEditor.selectAndReveal(searchMatch.startOffset, searchMatch.endOffset - searchMatch.startOffset);
 					}
+					
+				//TODO: Put in once we have marker support for External Translation Units
+				/*	//Get all the CProjects off the model
+					ICProject[] cprojects = CoreModel.getDefault().getCModel().getCProjects();
+					
+					ICProject containingProject=null;
+					ICElement celem = null;
+					//Find the CProject that the element belongs to
+					for (int i=0; i<cprojects.length; i++){
+						celem = cprojects[i].findElement(searchMatch.referringElement);
+						containingProject=celem.getCProject();
+						if (containingProject != null)
+							break;
+					}
+					//Create a translation unit, open in editor
+					ITranslationUnit unit = CoreModel.getDefault().createTranslationUnitFrom(containingProject, searchMatch.path);
+					IEditorPart editorPart = null;
+					if (unit != null) {
+						editorPart = EditorUtility.openInEditor(unit);
+					}
+					//Show with marker
+					if (editorPart instanceof ITextEditor) {
+						ITextEditor textEditor= (ITextEditor) editorPart;
+						showWithMarker(textEditor,(IFile) celem.getUnderlyingResource(),searchMatch.startOffset, searchMatch.endOffset - searchMatch.startOffset);
+					}*/
 				} catch (CModelException e) {}
 				  catch (CoreException e) {}
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
index 1e44fde33a7..fb9d6addde7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
@@ -20,7 +20,6 @@ import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor2;
 import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference;
 import org.eclipse.cdt.ui.CElementContentProvider;
 import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.IWorkingCopyManager;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -50,6 +49,7 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
@@ -208,7 +208,11 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
         IContentAssistProcessor processor = null;
 
 		IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditor().getEditorInput());
-        IResource resource = workingCopy.getResource();
+        
+		if (workingCopy == null)
+			return null;
+		
+		IResource resource = workingCopy.getResource();
         if (resource != null) {
             IProject project = resource.getProject();
             ICFileType type = CCorePlugin.getDefault().getFileType(project, resource.getLocation().lastSegment());