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 5232f0fe0..3190ab499 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
@@ -86,7 +86,7 @@ public class Order extends OrderLineGroup implements IValidable {
 
     public TaskGroup getAssociatedTaskElement() {
         Set<TaskElement> taskElements = this.getTaskElements();
-        if (taskElements != null) {
+        if (!taskElements.isEmpty()) {
             return (TaskGroup) taskElements.iterator().next();
         } else {
             return null;