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 a07aba986..56dabb00a 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
@@ -49,7 +49,9 @@ public class AdvanceMeasurement extends BaseEntity {
 
     public void setValue(BigDecimal value) {
         this.value = value;
-        this.value.setScale(2);
+        if (value != null) {
+            this.value.setScale(2);
+        }
     }
 
     public BigDecimal getValue() {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurementComparator.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurementComparator.java
index 6422224bb..8bb851ede 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurementComparator.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurementComparator.java
@@ -18,6 +18,9 @@ public class AdvanceMeasurementComparator implements Comparator<AdvanceMeasureme
 
     @Override
     public int compare(AdvanceMeasurement arg0, AdvanceMeasurement arg1) {
+        if (arg0.getDate() == arg1.getDate()) {
+            return 0;
+        }
         if (arg0.getDate() == null) {
             return -1;
         }