diff --git a/lib/screens/logs/log_tile.dart b/lib/screens/logs/log_tile.dart
index 9dfea35..2a6a720 100644
--- a/lib/screens/logs/log_tile.dart
+++ b/lib/screens/logs/log_tile.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: use_build_context_synchronously
-
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -133,6 +131,8 @@ class LogTile extends StatelessWidget {
       
       processModal.close();
 
+      if (!context.mounted) return;
+
       if (result == true) {
         showSnacbkar(
           appConfigProvider: appConfigProvider,
@@ -224,12 +224,15 @@ class LogTile extends StatelessWidget {
     void openAddClient() {
       Future.delayed(
         const Duration(milliseconds: 0), 
-        () => openClientFormModal(
-          context: context, 
-          width: MediaQuery.of(context).size.width, 
-          onConfirm: confirmAddClient,
-          initialData: ClientInitialData(name:  "Client ${log.client}", ip: log.client)
-        )
+        () {
+          if (!context.mounted) return;
+          openClientFormModal(
+            context: context, 
+            width: MediaQuery.of(context).size.width, 
+            onConfirm: confirmAddClient,
+            initialData: ClientInitialData(name:  "Client ${log.client}", ip: log.client)
+          );
+        }
       );
     }
 
diff --git a/lib/screens/settings/dns/test_upstream_dns_modal.dart b/lib/screens/settings/dns/test_upstream_dns_modal.dart
index 8410334..7bff710 100644
--- a/lib/screens/settings/dns/test_upstream_dns_modal.dart
+++ b/lib/screens/settings/dns/test_upstream_dns_modal.dart
@@ -29,6 +29,10 @@ class _TestUpstreamDnsModalState extends State<TestUpstreamDnsModal> {
 
   void checkDns() async {
     final dnsProvider = Provider.of<DnsProvider>(context, listen: false);
+    if (dnsProvider.dnsInfo == null) {
+      setState(() => loadStatus = LoadStatus.error);
+      return;
+    }
     final result = await Provider.of<ServersProvider>(context, listen: false).apiClient2!.testUpstreamDns(
       body: {
         "bootstrap_dns": dnsProvider.dnsInfo!.bootstrapDns,