diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
index bf435cb97..88c1d0824 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
@@ -95,7 +95,7 @@ public class AdvanceMeasurement extends BaseEntity {
 
     @NotNull(message = "value not specified")
     public BigDecimal getValue() {
-        return this.value;
+        return value != null ? value : BigDecimal.ZERO;
     }
 
     public void setAdvanceAssignment(AdvanceAssignment advanceAssignment) {
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 730475ec8..5cd7bf101 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
@@ -538,9 +538,9 @@ public class OrderLineGroup extends OrderElement implements
             next2 = null;
         }
 
-        BigDecimal previous1 = new BigDecimal(0);
-        BigDecimal previous2 = new BigDecimal(0);
-        BigDecimal previousResult = new BigDecimal(0);
+        BigDecimal previous1 = BigDecimal.ZERO;
+        BigDecimal previous2 = BigDecimal.ZERO;
+        BigDecimal previousResult = BigDecimal.ZERO;
 
         LocalDate date;
         BigDecimal add;