diff --git a/generate-cookiecutter-products-auto.groovy b/generate-cookiecutter-products-auto.groovy
index dfd3118..dbfc9cf 100644
--- a/generate-cookiecutter-products-auto.groovy
+++ b/generate-cookiecutter-products-auto.groovy
@@ -69,7 +69,7 @@
             }
 
             stage('Generate product OpenContrail') {
-                if (templateContext.default_context.contrail_enabled.toBoolean()) {
+                if (templateContext.default_context.opencontrail_enabled.toBoolean()) {
                     templateDir = "${templateEnv}/cluster_product/opencontrail"
                     templateOutputDir = "${env.WORKSPACE}/template/output/opencontrail"
                     sh "mkdir -p ${templateOutputDir}"
@@ -137,7 +137,7 @@
                 }
                 sh(returnStatus: true, script: "tar -zcvf ${clusterName}.tar.gz -C ${modelEnv} .")
                 archiveArtifacts artifacts: "${clusterName}.tar.gz"
-                if(EMAIl_ADDRESS.toBoolean()){
+                if(EMAIl_ADDRESS != null && EMAIL_ADDRESS){
                      //TODO: mail
                      def TODO= "todo"
                 }