diff --git a/plugins/android/resources/fileTemplates/j2ee/Remote Interface.aidl.ft b/plugins/android/resources/fileTemplates/j2ee/Remote Interface.aidl.ft
index 6e1922a72e67..20c34849daf7 100644
--- a/plugins/android/resources/fileTemplates/j2ee/Remote Interface.aidl.ft	
+++ b/plugins/android/resources/fileTemplates/j2ee/Remote Interface.aidl.ft	
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME};#end
 
 #parse("File Header.java")
 interface ${NAME} {
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyAnnotation.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyAnnotation.groovy.ft
index ea30628b25a8..97d88fe29655 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyAnnotation.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyAnnotation.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 #parse("File Header.java")
 
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyClass.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyClass.groovy.ft
index 5f9c51f3a8fa..7f6b7bb24837 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyClass.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyClass.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 
 #parse("File Header.java")
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyControllerTests.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyControllerTests.groovy.ft
index 0b8335bb5831..770b8f83ecae 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyControllerTests.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyControllerTests.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 #parse("File Header.java")
 
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyEnum.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyEnum.groovy.ft
index c38cf35097b3..83c6b8c12142 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyEnum.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyEnum.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 
 #parse("File Header.java")
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyInterface.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyInterface.groovy.ft
index 334a12a1d3f8..e5afc85fd8ed 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyInterface.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyInterface.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 
 #parse("File Header.java")
diff --git a/plugins/groovy/resources/fileTemplates/j2ee/GroovyScript.groovy.ft b/plugins/groovy/resources/fileTemplates/j2ee/GroovyScript.groovy.ft
index ab1caad6d140..b45a1b674d38 100644
--- a/plugins/groovy/resources/fileTemplates/j2ee/GroovyScript.groovy.ft
+++ b/plugins/groovy/resources/fileTemplates/j2ee/GroovyScript.groovy.ft
@@ -1,4 +1,4 @@
-#if ( $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
+#if (${PACKAGE_NAME} && $PACKAGE_NAME != "" )package ${PACKAGE_NAME}
 #end
 
 #parse("File Header.java")
diff --git a/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Project.xml.ft b/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Project.xml.ft
index 4c9bb1a63285..5370d53f20f7 100644
--- a/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Project.xml.ft	
+++ b/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Project.xml.ft	
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-#if (${HAS_PARENT} != "")
+#if (${HAS_PARENT})
     <parent>
         <groupId>${PARENT_GROUP_ID}</groupId>
         <artifactId>${PARENT_ARTIFACT_ID}</artifactId>
diff --git a/resources-en/src/fileTemplates/Singleton.java.ft b/resources-en/src/fileTemplates/Singleton.java.ft
index cd7567f8db61..0fda414343b4 100644
--- a/resources-en/src/fileTemplates/Singleton.java.ft
+++ b/resources-en/src/fileTemplates/Singleton.java.ft
@@ -1,4 +1,4 @@
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
 #parse("File Header.java")
 public class ${NAME}{
     private static ${NAME} ourInstance = new ${NAME}();
diff --git a/resources-en/src/fileTemplates/internal/AnnotationType.java.ft b/resources-en/src/fileTemplates/internal/AnnotationType.java.ft
index 76f2c7fc44a3..e1ae18257501 100644
--- a/resources-en/src/fileTemplates/internal/AnnotationType.java.ft
+++ b/resources-en/src/fileTemplates/internal/AnnotationType.java.ft
@@ -1,4 +1,4 @@
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
 #parse("File Header.java")
 public @interface ${NAME} {
 }
diff --git a/resources-en/src/fileTemplates/internal/Class.java.ft b/resources-en/src/fileTemplates/internal/Class.java.ft
index 564a9bb12d2c..a5222da6ed82 100644
--- a/resources-en/src/fileTemplates/internal/Class.java.ft
+++ b/resources-en/src/fileTemplates/internal/Class.java.ft
@@ -1,4 +1,4 @@
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
 #parse("File Header.java")
 public class ${NAME} {
 }
diff --git a/resources-en/src/fileTemplates/internal/Enum.java.ft b/resources-en/src/fileTemplates/internal/Enum.java.ft
index 810a2741ad55..e160eb4b2340 100644
--- a/resources-en/src/fileTemplates/internal/Enum.java.ft
+++ b/resources-en/src/fileTemplates/internal/Enum.java.ft
@@ -1,4 +1,4 @@
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
 #parse("File Header.java")
 public enum ${NAME} {
 }
diff --git a/resources-en/src/fileTemplates/internal/Interface.java.ft b/resources-en/src/fileTemplates/internal/Interface.java.ft
index 8671aa653813..ded1b0699d96 100644
--- a/resources-en/src/fileTemplates/internal/Interface.java.ft
+++ b/resources-en/src/fileTemplates/internal/Interface.java.ft
@@ -1,4 +1,4 @@
-#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
 #parse("File Header.java")
 public interface ${NAME} {
 }