diff --git a/Sevomin.Models/JobParameterViewModel.cs b/Sevomin.Models/JobParameterViewModel.cs
index 0d78a9a..ba13a92 100644
--- a/Sevomin.Models/JobParameterViewModel.cs
+++ b/Sevomin.Models/JobParameterViewModel.cs
@@ -45,6 +45,7 @@ namespace Sevomin.Models
             CommentAvalin = jp.Parameter.CommentAvalin;
             CommentDovomin = jp.Parameter.CommentDovomin;
 
+            ParameterValues = new List<Tuple<decimal, string>>();
             foreach (var val in jp.Parameter.ParameterValues)
             {
                 ParameterValues.Add(new Tuple<decimal, string>(val.NumbericValue, val.Value));
diff --git a/Sevomin.Models/Repositories/JobRepository.cs b/Sevomin.Models/Repositories/JobRepository.cs
index 0335f74..c300101 100644
--- a/Sevomin.Models/Repositories/JobRepository.cs
+++ b/Sevomin.Models/Repositories/JobRepository.cs
@@ -66,6 +66,10 @@ namespace Sevomin.Models.Repositories
         public Job GetEmptyJobFor(Avalin avalin)
         {
             Job job = new Job();
+            var parameters = ParameterRepository.Current.ListAll();
+
+            job.JobParameters = new List<JobParameter>();
+            
             foreach (var param in ParameterRepository.Current.ListAll())
             {
                 JobParameter jp = new JobParameter(job, param);