diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 5616c0e569a..72b61b990f6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -3773,10 +3773,13 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
 	@Override
 	protected void editorSaved() {
 		super.editorSaved();
-		ITranslationUnit translationUnit = getInputCElement().getOriginalElement();
-		if (translationUnit != null) {
-			for (Object listener : fPostSaveListeners.getListeners()) {
-				((IPostSaveListener) listener).saved(translationUnit, getProgressMonitor());
+		IWorkingCopy inputCElement = getInputCElement();
+		if (inputCElement != null) {
+			ITranslationUnit translationUnit = inputCElement.getOriginalElement();
+			if (translationUnit != null) {
+				for (Object listener : fPostSaveListeners.getListeners()) {
+					((IPostSaveListener) listener).saved(translationUnit, getProgressMonitor());
+				}
 			}
 		}
 	}