diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
new file mode 100644
index 00000000000..788d94a46bf
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -0,0 +1,5 @@
+2002-10-11 Alain Magloire
+	* CEditorTextHoverDispatcher.java (getCurrentTextHover):
+	This fixes a null pointer exception received when we hover 
+	over the code in the C/C++ Editor colour preference dialog.
+	From Thomas Fletcher.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorTextHoverDispatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorTextHoverDispatcher.java
index 41107385cbd..9007d928e9e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorTextHoverDispatcher.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorTextHoverDispatcher.java
@@ -47,9 +47,9 @@ public class CEditorTextHoverDispatcher implements ITextHover
 	
 	private ITextHover getCurrentTextHover()
 	{
-		IWorkbenchPage page = fEditor.getSite().getPage();
-		if ( page != null )
-		{
+		IWorkbenchPage page;
+		if(fEditor != null && fEditor.getSite() != null && 
+		   (page = fEditor.getSite().getPage()) != null) {
 			Object textHover = fTextHovers.get( page.getPerspective().getId() );
 			if ( textHover != null && textHover instanceof ITextHover )
 				return (ITextHover)textHover;