From 5739a241b7e3cd7078e9dba34a72e0dc6438a51b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 16 Oct 2009 16:27:30 +0400
Subject: [PATCH] IDEADEV-40871

---
 .../src/com/intellij/codeInsight/template/impl/TemplateSettings.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index c0d46a1f7d..7e9d671ee6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
@@ -263,7 +263,9 @@ public class TemplateSettings implements PersistentStateComponent<Element>, Expo
       for (final TemplateKey deletedTemplate : myDeletedTemplates) {
         Element template = new Element(TEMPLATE);
         template.setAttribute(NAME, deletedTemplate.key);
-        template.setAttribute(GROUP, deletedTemplate.groupName);
+        if (deletedTemplate.groupName != null) {
+          template.setAttribute(GROUP, deletedTemplate.groupName);
+        }
         deleted.addContent(template);
 
       }
-- 
2.11.4.GIT