diff --git a/lib/constants.dart b/lib/constants.dart
index b25f79563..25bc29224 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // This version must be updated in tandem with the pubspec version.
-const String kAppVersion = '2.0.5';
+const String kAppVersion = '2.0.4';
 const String kSiteUrl = 'https://invoiceninja.com';
 //const String kAppUrl = 'https://admin.invoiceninja.com';
 const String kAppUrl = 'https://staging.invoicing.co';
diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart
index eea7a26b7..0a25e70e6 100644
--- a/lib/redux/app/app_middleware.dart
+++ b/lib/redux/app/app_middleware.dart
@@ -17,14 +17,18 @@ import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
 import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
 import 'package:invoiceninja_flutter/redux/company/company_state.dart';
 import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
+import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart';
 import 'package:invoiceninja_flutter/redux/product/product_actions.dart';
+import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
 import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
+import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_state.dart';
+import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/app_builder.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/main_screen.dart';
@@ -413,10 +417,12 @@ Middleware<AppState> _createAccountLoaded() {
           store.dispatch(LoadInvoicesSuccess(company.invoices));
           store.dispatch(LoadPaymentsSuccess(company.payments));
           //store.dispatch(LoadQuotesSuccess(company.quotes));
-          //store.dispatch(LoadTasksSuccess(company.tasks));
-          //store.dispatch(LoadProjectsSuccess(company.projects));
-          //store.dispatch(LoadVendorsSuccess(company.vendors));
-          //store.dispatch(LoadExpensesSuccess(company.expenses));
+          if (Config.DEMO_MODE) {
+            store.dispatch(LoadTasksSuccess(company.tasks));
+            store.dispatch(LoadProjectsSuccess(company.projects));
+            store.dispatch(LoadVendorsSuccess(company.vendors));
+            store.dispatch(LoadExpensesSuccess(company.expenses));
+          }
         }
       }
 
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index fc2580423..7f0250728 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -153,7 +153,7 @@ class ReportsScreen extends StatelessWidget {
                           //kReportExpense,
                           kReportInvoice,
                           kReportPayment,
-                          kReportProduct,
+                          //kReportProduct,
                           //kReportProfitAndLoss,
                           //kReportTask,
                           //kReportTaxRate,
diff --git a/lib/utils/money.dart b/lib/utils/money.dart
index b13e36394..dfa6344c3 100644
--- a/lib/utils/money.dart
+++ b/lib/utils/money.dart
@@ -25,7 +25,7 @@ double getExchangeRateWithMap(BuiltMap<String, CurrencyEntity> currencyMap,
   }
 
   if (toCurrency == baseCurrency) {
-    return 1 / (fromCurrency.exchangeRate ?? 1);
+    return 1 / (fromCurrency?.exchangeRate ?? 1);
   }
 
   return toCurrency.exchangeRate * (1 / fromCurrency.exchangeRate);