diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
index 02012dceb..9b11e354f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/EditTaskUtilities.java
@@ -83,6 +83,9 @@ public class EditTaskUtilities implements IEditTaskUtilities {
 
     private void reattachAndLoadCalendar(TaskElement taskElement) {
         BaseCalendar calendar = taskElement.getCalendar();
+        if (calendar == null) {
+            return;
+        }
         baseCalendarDAO.reattach(calendar);
         forceLoadCalendar(calendar);
         calendar.getCapacityOn(