diff -up ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
--- ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix	2009-01-20 14:30:41.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java	2009-01-20 14:33:26.000000000 -0500
@@ -359,8 +359,10 @@ public class PrepareChangeLogAction exte
 		int unitwork = 250 / patchFileInfoList.length;
 		for (PatchFile pf: patchFileInfoList) {
 			// for each file
-			String[] funcGuessList = guessFunctionNames(pf);
-			outputMultipleEntryChangeLog(pf, funcGuessList);
+			if (pf != null) { // changes to ChangeLogs will have null entries
+				String[] funcGuessList = guessFunctionNames(pf);
+				outputMultipleEntryChangeLog(pf, funcGuessList);
+			}
 			monitor.worked(unitwork);
 		}
 	}
@@ -543,4 +545,4 @@ public class PrepareChangeLogAction exte
 		}
 		return fnames;
 	}
-}
\ No newline at end of file
+}
diff -up ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java
--- ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix	2009-01-20 14:30:56.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java	2009-01-20 14:34:16.000000000 -0500
@@ -12,16 +12,16 @@ package org.eclipse.linuxtools.changelog
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
 
 /**
  * @author klee (Kyu Lee)
  */
-public class ChangeLogDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-
-		return super.createDocument(element);
+public class ChangeLogDocumentProvider extends TextFileDocumentProvider {
 
+	@Override
+	public IDocument getDocument(Object element) {
+		return super.getDocument(element);
 	}
+
 }