diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java index 74a8eda16..0bb85e00b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java @@ -269,10 +269,13 @@ public class Order extends OrderLineGroup { public List getAllChildrenAssociatedTaskElements() { List result = new ArrayList(); - List children = getAllChildren(); - for (OrderElement orderElement : children) { - result.add(orderElement.getAssociatedTaskElement()); + for (OrderElement orderElement : getAllChildren()) { + TaskElement taskElement = orderElement.getAssociatedTaskElement(); + if (taskElement != null) { + result.add(taskElement); + } } + Validate.noNullElements(result); return result; }