diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index db79c7ef13..2abd9ad68a 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -451,7 +451,10 @@ class Job(UnifiedJob, JobOptions):
             evars = json.loads(self.extra_vars)
         except Exception, e:
             return
-        evars.update(extra_data)
+        if evars is None:
+            evars = extra_data
+        else:
+            evars.update(extra_data)
         self.update_fields(extra_vars=json.dumps(evars))
 
     def copy(self):