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 f3a0eebd6..a8df8dc13 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
@@ -99,9 +99,11 @@ public class Gap implements Comparable<Gap> {
     }
 
     private Integer calculateHoursInGap(Resource resource, DateAndHour startTime, DateAndHour endTime) {
-        return (endTime == null) ? Integer.MAX_VALUE : calculateHoursInGap(
-                resource, startTime.getDate(), startTime.getHour(), endTime
-                        .getDate(), endTime.getHour());
+        // this method will be removed; when hours in gap is really used
+        // startTime is never null
+        return (endTime == null || startTime == null) ? Integer.MAX_VALUE
+                : calculateHoursInGap(resource, startTime.getDate(), startTime
+                        .getHour(), endTime.getDate(), endTime.getHour());
     }
 
     public int getHoursInGap() {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
index 2974473cf..ba97a509c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
@@ -87,7 +87,7 @@ public class LimitingResourceQueue extends BaseEntity {
         DateAndHour previousEnd = null;
         for (LimitingResourceQueueElement each : limitingResourceQueueElements) {
             DateAndHour startTime = each.getStartTime();
-            if (startTime.isAfter(startTime)) {
+            if (previousEnd == null || startTime.isAfter(previousEnd)) {
                 result.add(Gap.create(resource, previousEnd, startTime));
             }
             previousEnd = each.getEndTime();