diff --git a/lib/ui/app/dialogs/health_check_dialog.dart b/lib/ui/app/dialogs/health_check_dialog.dart
index 1bf576bdf..b9c7cba23 100644
--- a/lib/ui/app/dialogs/health_check_dialog.dart
+++ b/lib/ui/app/dialogs/health_check_dialog.dart
@@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/data/web_client.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
+import 'package:invoiceninja_flutter/utils/dialogs.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
 class HealthCheckDialog extends StatefulWidget {
@@ -43,11 +44,7 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
             HealthCheckResponse.serializer, response);
       });
     }).catchError((dynamic error) {
-      showDialog<ErrorDialog>(
-          context: context,
-          builder: (BuildContext context) {
-            return ErrorDialog(error);
-          });
+      showErrorDialog(context: context, message: error);
     });
   }
 
@@ -69,11 +66,7 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
               runCheck();
             })));
     }).catchError((dynamic error) {
-      showDialog<ErrorDialog>(
-          context: context,
-          builder: (BuildContext context) {
-            return ErrorDialog(error);
-          });
+      showErrorDialog(context: context, message: error);
     });
   }
 
diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
index 5be069d5a..34371d900 100644
--- a/lib/ui/app/upgrade_dialog.dart
+++ b/lib/ui/app/upgrade_dialog.dart
@@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:flutter/material.dart';
+import 'package:invoiceninja_flutter/utils/dialogs.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -57,9 +58,15 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
     };
 
     try {
-      final dynamic response = await webClient.post(
-          '$kAppProductionUrl/api/v1/upgrade', state.credentials.token,
-          data: json.encode(data));
+      final dynamic response = await webClient
+          .post(
+        '$kAppProductionUrl/api/v1/upgrade',
+        state.credentials.token,
+        data: json.encode(data),
+      )
+          .catchError((dynamic error) {
+        showErrorDialog(context: context, message: error);
+      });
       final String message = response['message'];
 
       if (message == 'success') {
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index 47379dbc7..005ddd8a3 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:flutter_styled_toast/flutter_styled_toast.dart';
+import 'package:invoiceninja_flutter/main_app.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/utils/oauth.dart';
 import 'package:qr_flutter/qr_flutter.dart';
@@ -352,6 +353,9 @@ class _EnableTwoFactorState extends State<_EnableTwoFactor> {
         _qrCode = response.data.qrCode;
         _secret = response.data.secret;
       });
+    }).catchError((dynamic error) {
+      Navigator.of(context).pop();
+      showErrorDialog(context: context, message: error);
     });
   }