diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index cf3d6d5c1..10014038b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -698,6 +698,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     private void forceLoadOfWorkingHours(List<TaskElement> initial) {
         for (TaskElement taskElement : initial) {
+            taskElement.getTaskSource().getTotalHours();
             OrderElement orderElement = taskElement.getOrderElement();
             if (orderElement != null) {
                 orderElement.getWorkHours();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
index 6201944db..4ad06caf4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
@@ -188,8 +188,12 @@ public class TaskPropertiesController extends GenericForwardComposer {
                 .getStartConstraintType();
         startConstraintTypes.setSelectedItemApi(findComboWithType(type));
         startConstraintDate.setVisible(type.isAssociatedDateRequired());
-        startConstraintDate.setValue(task.getStartConstraint()
-                .getConstraintDate());
+
+        Date constraintDate = task.getStartConstraint()
+                .getConstraintDate();
+        if (constraintDate != null) {
+            startConstraintDate.setValue(constraintDate);
+        }
     }
 
     private Comboitem findComboWithType(StartConstraintType type) {