diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
index ebdc8dcaf71..998cb72cfdd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
@@ -192,7 +192,10 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate {
 			IFunctionSummary fs = findContribution(name);
 			if (fs != null) {
 				fRequiredIncludes = fs.getIncludes();
-				fUsings = new String[] {fs.getNamespace()};
+				String ns = fs.getNamespace();
+				if (ns != null && ns.length() > 0) {
+					fUsings = new String[] {fs.getNamespace()};
+				}
 			}
 
 			// Try the type caching.