diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
index 758c94c..e33a529 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListController.java
@@ -137,6 +137,15 @@ public class OPListController implements Serializable {
                 // passen
                 invoiceList = new ArrayList<ItemCollection>();
                 for (ItemCollection _invoice : invoiceListTemp) {
+
+                    // Test if we have 'invoice.base.amount' and 'invoice.rate'
+                    if (!_invoice.hasItem("invoice.base.amount")) {
+                        _invoice.setItemValue("invoice.base.amount", 0.0);
+                    }
+                    if (!_invoice.hasItem("invoice.rate")) {
+                        _invoice.setItemValue("invoice.rate", 0.0);
+                    }
+
                     if (currencyFilter == null || currencyFilter.isEmpty() || currencyFilter.equals("-")) {
                         invoiceList.add(_invoice);
                     } else {
@@ -162,6 +171,8 @@ public class OPListController implements Serializable {
                     if (rate != 0) {
                         maxSaldo = maxSaldo / rate;
                         invoice.setItemValue("invoice.saldo.byrate", maxSaldo);
+                    } else {
+                        invoice.setItemValue("invoice.saldo.byrate", 0.0);
                     }
                 }
             }