diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 1da286ac893..df742d1de3d 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-19 Alain Magloire
+	Fix NPE.
+	* src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
+
 2004-10-19 Mikhail Khodjaiants
 	Support of the thread-specific breakpoints. 
 	Fix for the error handling of the asynchronous operations.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
index 1502d2f1068..7a03d951455 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
@@ -145,12 +145,14 @@ public class DebugConfiguration implements ICDebugConfiguration {
 	 */
 	public String[] getCoreFileExtensions() {
 		if (fCoreExt == null) {
-			String cexts = getConfigurationElement().getAttribute("coreFileFilter"); //$NON-NLS-1$
-			StringTokenizer tokenizer = new StringTokenizer(cexts, ","); //$NON-NLS-1$
 			List exts = new ArrayList();
-			while (tokenizer.hasMoreTokens()) {
-				String ext = tokenizer.nextToken().trim();
-				exts.add(ext);
+			String cexts = getConfigurationElement().getAttribute("coreFileFilter"); //$NON-NLS-1$
+			if (cexts != null) {
+				StringTokenizer tokenizer = new StringTokenizer(cexts, ","); //$NON-NLS-1$
+				while (tokenizer.hasMoreTokens()) {
+					String ext = tokenizer.nextToken().trim();
+					exts.add(ext);
+				}
 			}
 			exts.add("*.*"); //$NON-NLS-1$
 			fCoreExt = (String[])exts.toArray(new String[exts.size()]);