diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index c73624695b6..322ba944d18 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23 Alain Magloire
+	NPE fix.
+	* src/org/eclipse/cdt/internal/core/PathEntryVariableresolver.java
+
 2005-03-23 Alain Magloire
 	Optimize the pathentry markers.
 	* model/org/eclipse/cdt/internal/core/model/BinaryRunner.java
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableResolver.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableResolver.java
index 9420e8ba553..13df156fe0e 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableResolver.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableResolver.java
@@ -15,7 +15,9 @@ package org.eclipse.cdt.internal.core;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.resources.IPathEntryVariableManager;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.variables.IDynamicVariable;
 import org.eclipse.core.variables.IDynamicVariableResolver;
@@ -31,7 +33,11 @@ public class PathEntryVariableResolver implements IDynamicVariableResolver {
 			throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.ERROR, CCorePlugin.getResourceString("PathEntryVariableResolver.0"), null)); //$NON-NLS-1$
 		}
 		IPathEntryVariableManager manager = CCorePlugin.getDefault().getPathEntryVariableManager();
-		return manager.getValue(argument).toString();
+		IPath path = manager.getValue(argument);
+		if (path == null) {
+			path = Path.EMPTY;
+		}
+		return path.toPortableString();
 	}
 
 }