diff --git a/jenkins/client/job.sls b/jenkins/client/job.sls
index 821fff8..9375ad0 100644
--- a/jenkins/client/job.sls
+++ b/jenkins/client/job.sls
@@ -13,7 +13,7 @@
 
   {%- for job_template_name, job_template in client.get('job_template', {}).iteritems() %}
     {%- if job_template.get('enabled', true) %}
-      {%- for param_name, params in job_template.param.iteritems() %}
+      {%- for param_name, params in job_template.get('param', {}).iteritems() %}
         {%- set replacer = "{{" + param_name + "}}" %}
         {%- for param in params %}
           {%- set job_name = job_template.name|replace(replacer, param) %}
@@ -22,7 +22,7 @@
       {%- endfor %}
 
       {%- for job_params in job_template.get('jobs', []) %}
-        {%- set job_name = job.template.name %}
+        {%- set job_name = job_template.name %}
         {%- for key, value in job_params.iteritems() %}
           {%- set replacer = "{{" + key + "}}" %}
           {%- set job_name = job_name|replace(replacer, value) %}