diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 9f50784d4c6..24ee09a2577 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-20 Alain Magloire
+	Fix NPE in CDocumentProvider
+	* src/org/eclipse/cdt/internalu/ui/editor/CDocumentProvider.java
+
 2004-04-20 David Inglis
 
 	More of the model throws CModeLException. 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
index 731bd2c69d0..0f55fbcb00c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
@@ -94,8 +94,10 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 		if (element instanceof IFileEditorInput) {
 			IFileEditorInput input = (IFileEditorInput)element;
 			original = createTranslationUnit(input.getFile());
-			IBufferFactory factory = CUIPlugin.getDefault().getBufferFactory();
-			copy = original.getSharedWorkingCopy(getProgressMonitor(), factory);
+			if (original != null) {
+				IBufferFactory factory = CUIPlugin.getDefault().getBufferFactory();
+				copy = original.getSharedWorkingCopy(getProgressMonitor(), factory);
+			}
 		} else if (element instanceof ITranslationUnitEditorInput) {
 			ITranslationUnitEditorInput input = (ITranslationUnitEditorInput)element;
 			copy = new CFileElementWorkingCopy(input.getTranslationUnit());