diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java
index e116bb286ad..8c78f87894a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java
@@ -212,7 +212,7 @@ public class StubUtility {
 		String[] fullLine= { CodeTemplateContextType.FILE_COMMENT };
 		
 		String text = evaluateTemplate(context, template, fullLine);
-		if (!text.endsWith(lineDelimiter))
+		if (text != null && !text.endsWith(lineDelimiter))
 			text += lineDelimiter;
 		return text;
 	}