diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index ad806717ce2..6f0c2e87061 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-18 Alain Magloire
+
+	When running the CDescriptorOperation make sure we have an ICDescriptor.
+
+	* src/org/eclipse/cdt/internal/core/CDescriptorManager.java
+
 2004-08-18 Alain Magloire
 
 	The DeltaProcessor should update the sourceRoot also if
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java
index e0280eee849..1cb9bb35f2a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CDescriptorManager.java
@@ -358,9 +358,9 @@ public class CDescriptorManager implements ICDescriptorManager, IResourceChangeL
 	}
 
 	public void runDescriptorOperation(IProject project, ICDescriptorOperation op, IProgressMonitor monitor) throws CoreException {
-		ICDescriptor descriptor = getDescriptor(project, false);
+		ICDescriptor descriptor = getDescriptor(project, true);
 		if (descriptor == null) {
-			throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "Project does not have descriptor", null)); //$NON-NLS-1$
+			throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, "Failed to create descriptor", null)); //$NON-NLS-1$
 		}
 		CDescriptorEvent event = null;
 		synchronized (descriptor) {