diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog-parser b/core/org.eclipse.cdt.core/parser/ChangeLog-parser
index 8304cff559b..522971b16dc 100644
--- a/core/org.eclipse.cdt.core/parser/ChangeLog-parser
+++ b/core/org.eclipse.cdt.core/parser/ChangeLog-parser
@@ -1,3 +1,6 @@
+2004-04-05 John Camelon
+	Fixed NPE in CompleteParseASTFactory::createUsingDeclaration().  
+
 2004-04-05 John Camelon
 	Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=54029
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
index 65618ea8398..8787d2bc150 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
@@ -448,12 +448,14 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
 		ISymbol symbol = lookupQualifiedName( 
 			scopeToSymbol( scope), duple, references, true ); 
 
+		
 		IUsingDirectiveSymbol usingDirective = null;
-		try {
-			usingDirective = ((ASTScope)scope).getContainerSymbol().addUsingDirective( (IContainerSymbol)symbol );
-		} catch (ParserSymbolTableException pste) {
-			handleProblem( pste.createProblemID(), duple.toString(), startingOffset, endingOffset, startingLine );
-		}
+		if( symbol != null )
+			try {
+				usingDirective = ((ASTScope)scope).getContainerSymbol().addUsingDirective( (IContainerSymbol)symbol );
+			} catch (ParserSymbolTableException pste) {
+				handleProblem( pste.createProblemID(), duple.toString(), startingOffset, endingOffset, startingLine );
+			}
 		
 		return new ASTUsingDirective( scopeToSymbol(scope), usingDirective, startingOffset, startingLine, endingOffset, endingLine, references );
     }