diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
index 8484e1e58..2eb7b6cae 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
@@ -8,7 +8,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.resources.daos.ICriterionTypeDAO;
 import org.navalplanner.business.resources.daos.IResourceDAO;
@@ -377,7 +376,9 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion
                     satisfaction.setIsDeleted(true);
                 } else {
                     satisfaction.setStartDate(satisfactionDTO.getStartDate());
-                    satisfaction.finish(satisfactionDTO.getEndDate());
+                    if (satisfactionDTO.getEndDate() != null) {
+                        satisfaction.finish(satisfactionDTO.getEndDate());
+                    }
                 }
             }
             newList.add(satisfaction);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java
index f788bf9af..12ffe64f4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java
@@ -333,7 +333,9 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel {
                     satisfaction.setIsDeleted(true);
                 } else {
                     satisfaction.setStartDate(satisfactionDTO.getStartDate());
-                    satisfaction.finish(satisfactionDTO.getEndDate());
+                    if (satisfactionDTO.getEndDate() != null) {
+                        satisfaction.finish(satisfactionDTO.getEndDate());
+                    }
                 }
             }
             newList.add(satisfaction);