diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
index a216efef0..e8b925fe2 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
@@ -46,6 +46,13 @@ public class DateAndHour implements Comparable<DateAndHour> {
         return new DateAndHour(date.getDate(), date.getEffortDuration().getHours());
     }
 
+    public static DateAndHour TEN_YEARS_FROM(DateAndHour dateAndHour) {
+        LocalDate date = dateAndHour.getDate() != null ? dateAndHour.getDate() : new LocalDate();
+        DateAndHour result = new DateAndHour(date, dateAndHour.getHour());
+        result.plusYears(10);
+        return result;
+    }
+
     private LocalDate date;
 
     private Integer hour;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
index e8776be42..8e3bc1dd1 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
@@ -175,8 +175,7 @@ public class Gap implements Comparable<Gap> {
         // If endTime is null (last tasks) assume the end is in 10 years from now
         DateAndHour endDate = getEndTime();
         if (endDate == null) {
-            endDate = new DateAndHour(realStart);
-            endDate.plusYears(10);
+            endDate = DateAndHour.TEN_YEARS_FROM(realStart);
         }
 
         Iterator<PartialDay> daysUntilEnd = realStart.toIntraDayDate()