diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
index 8734d2694..593190cbc 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
@@ -1019,7 +1019,7 @@ public class OrderLineGroup extends OrderElement implements
 
         for (OrderElement each : getAllOrderElements()) {
             String code = each.getCode();
-            if (code != null) {
+            if (code != null && !code.isEmpty()) {
                 if (codes.contains(code)) {
                     return each;
                 }
@@ -1035,7 +1035,7 @@ public class OrderLineGroup extends OrderElement implements
 
         for (HoursGroup hoursGroup : getHoursGroups()) {
             String code = hoursGroup.getCode();
-            if (code != null) {
+            if (code != null && !code.isEmpty()) {
                 if (codes.contains(code)) {
                     return hoursGroup;
                 }