diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java
index 93515351319..ba1af526339 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeCreator.java
@@ -322,7 +322,7 @@ public class IncludeCreator {
 		// Put the new includes into styledIncludes.
 		for (IncludeInfo includeInfo : includes) {
 			IPath header = fContext.resolveInclude(includeInfo);
-			if (!fContext.wasIncludedPreviously(header)) {
+			if (header != null && !fContext.wasIncludedPreviously(header)) {
 				IncludeGroupStyle style = fContext.getIncludeStyle(includeInfo);
 				StyledInclude prototype = new StyledInclude(header, includeInfo, style);
 				styledIncludes.add(prototype);