diff --git a/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java b/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java
index 8d5e12bc2a0a..d3db36470740 100644
--- a/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java
+++ b/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java
@@ -182,7 +182,7 @@ public class RemoteTemplatesFactory extends ProjectTemplatesFactory {
 
   static List<WizardInputField> getFields(Element templateElement, final Namespace ns) {
     //noinspection unchecked
-    return ContainerUtil.map(templateElement.getChildren(INPUT_FIELD, ns), new Function<Element, WizardInputField>() {
+    return ContainerUtil.mapNotNull(templateElement.getChildren(INPUT_FIELD, ns), new Function<Element, WizardInputField>() {
       @Override
       public WizardInputField fun(Element element) {
         ProjectTemplateParameterFactory factory = WizardInputField.getFactoryById(element.getText());