diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 3f26886d793..80eeb46ab36 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-06 Alain Magloire
+	Fix for 79865
+	* src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java
+
 2004-12-03 Chris Wiebe
 	fix for 74098
 	* src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java
index 3bdcde43e53..084340e132e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHelpProviderDescriptor.java
@@ -128,9 +128,9 @@ public class CHelpProviderDescriptor {
 	}
 	
 	public CHelpBookDescriptor [] getCHelpBookDescriptors(Element projectElement){
-		if(fHelpBookDescriptors == null || projectElement != null){
+		if (fHelpBookDescriptors == null || projectElement != null){
 			ICHelpProvider provider = getCHelpProvider();
-			if(provider != null){
+			if (provider != null && fProject != null) {
 				ICHelpBook books[] = provider.getCHelpBooks();
 				if(books != null){
 					List descriptorList = new ArrayList();