diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index 2ed553df6954..c3aa1eff0569 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -268430,7 +268430,7 @@
       return this.getActions$4$client$includeEdit$multiselect$userCompany(null, false, false, userCompany);
     },
     compareTo$9: function(_, expense, sortField, sortAscending, clientMap, userMap, vendorMap, invoiceMap, expenseCategoryMap, staticState) {
-      var response, t1, t2, t3, userA, userB, clientA, clientB, vendorA, vendorB, stateA, stateB, currencyMap, _null = null,
+      var response, t1, t2, t3, userA, userB, clientA, clientB, vendorA, vendorB, stateA, stateB, currencyMap, currencyA, currencyB, categoryA, categoryB, invoiceA, invoiceB, _null = null,
         _s8_ = "archived",
         expenseA = sortAscending ? this : expense,
         expenseB = sortAscending ? expense : this;
@@ -268551,14 +268551,26 @@
           t1 = expenseA.currencyId;
           t2 = currencyMap._map$_map;
           t3 = J.getInterceptor$asx(t2);
-          response = C.JSString_methods.compareTo$1(t3.$index(t2, t1).name, t3.$index(t2, expenseB.currencyId).name);
+          currencyA = t3.$index(t2, t1);
+          if (currencyA == null)
+            currencyA = O.CurrencyEntity_CurrencyEntity();
+          currencyB = t3.$index(t2, expenseB.currencyId);
+          if (currencyB == null)
+            currencyB = O.CurrencyEntity_CurrencyEntity();
+          response = C.JSString_methods.compareTo$1(currencyA.name.toLowerCase(), currencyB.name.toLowerCase());
           break;
         case "category_id":
         case "category":
           t1 = expenseA.categoryId;
           t2 = expenseCategoryMap._map$_map;
           t3 = J.getInterceptor$asx(t2);
-          response = C.JSString_methods.compareTo$1(t3.$index(t2, t1).name, t3.$index(t2, expenseB.categoryId).name);
+          categoryA = t3.$index(t2, t1);
+          if (categoryA == null)
+            categoryA = R.ExpenseCategoryEntity_ExpenseCategoryEntity(_null, _null);
+          categoryB = t3.$index(t2, expenseB.categoryId);
+          if (categoryB == null)
+            categoryB = R.ExpenseCategoryEntity_ExpenseCategoryEntity(_null, _null);
+          response = C.JSString_methods.compareTo$1(categoryA.name.toLowerCase(), categoryB.name.toLowerCase());
           break;
         case "exchange_rate":
           response = C.JSNumber_methods.compareTo$1(expenseA.exchangeRate, expenseB.exchangeRate);
@@ -268568,7 +268580,13 @@
           t1 = expenseA.invoiceCurrencyId;
           t2 = currencyMap._map$_map;
           t3 = J.getInterceptor$asx(t2);
-          response = C.JSString_methods.compareTo$1(t3.$index(t2, t1).name, t3.$index(t2, expenseB.invoiceCurrencyId).name);
+          currencyA = t3.$index(t2, t1);
+          if (currencyA == null)
+            currencyA = O.CurrencyEntity_CurrencyEntity();
+          currencyB = t3.$index(t2, expenseB.invoiceCurrencyId);
+          if (currencyB == null)
+            currencyB = O.CurrencyEntity_CurrencyEntity();
+          response = C.JSString_methods.compareTo$1(currencyA.name.toLowerCase(), currencyB.name.toLowerCase());
           break;
         case "tax_name1":
           response = C.JSString_methods.compareTo$1(expenseA.taxName1, expenseB.taxName1);
@@ -268586,9 +268604,13 @@
           t1 = expenseA.invoiceId;
           t2 = invoiceMap._map$_map;
           t3 = J.getInterceptor$asx(t2);
-          t1 = t3.$index(t2, t1).number;
-          t2 = t3.$index(t2, expenseB.invoiceId).number;
-          response = C.JSString_methods.compareTo$1(t1, t2);
+          invoiceA = t3.$index(t2, t1);
+          if (invoiceA == null)
+            invoiceA = Q.InvoiceEntity_InvoiceEntity(_null, _null, _null, _null, _null);
+          invoiceB = t3.$index(t2, expenseB.invoiceId);
+          if (invoiceB == null)
+            invoiceB = Q.InvoiceEntity_InvoiceEntity(_null, _null, _null, _null, _null);
+          response = C.JSString_methods.compareTo$1(invoiceA.number, invoiceB.number);
           break;
         case "custom1":
           response = C.JSString_methods.compareTo$1(expenseA.customValue1, expenseB.customValue1);