diff --git a/core/lib/presentation/views/dialog/modal_list_action_button_widget.dart b/core/lib/presentation/views/dialog/modal_list_action_button_widget.dart
index f33d3c8e0..afcaa4037 100644
--- a/core/lib/presentation/views/dialog/modal_list_action_button_widget.dart
+++ b/core/lib/presentation/views/dialog/modal_list_action_button_widget.dart
@@ -55,14 +55,17 @@ class ModalListActionButtonWidget extends StatelessWidget {
       ),
     );
 
-    Widget progressingButton = const SizedBox(
+    Widget progressingButton = SizedBox(
       height: 48,
       width: 153,
       child: ConfirmDialogButton(
-        label: '',
+        label: positiveLabel,
         padding: EdgeInsets.zero,
         backgroundColor: AppColor.primaryMain,
-        child: CupertinoLoadingWidget(color: Colors.white),
+        child: CupertinoLoadingWidget(
+          color: Colors.white,
+          semanticLabel: positiveLabel,
+        ),
       ),
     );
 
diff --git a/integration_test/scenarios/labels/create_a_new_tag_from_an_email_scenario.dart b/integration_test/scenarios/labels/create_a_new_tag_from_an_email_scenario.dart
index a8c2757f9..21e3b6b25 100644
--- a/integration_test/scenarios/labels/create_a_new_tag_from_an_email_scenario.dart
+++ b/integration_test/scenarios/labels/create_a_new_tag_from_an_email_scenario.dart
@@ -49,7 +49,7 @@ class CreateANewTagFromAnEmailScenario extends BaseTestScenario
     await addLabelModalRobot.tapCreateANewLabel();
     await _expectCreateNewLabelModalVisible();
 
-    const newLabelName = 'New Label 1';
+    final newLabelName = 'New Label ${DateTime.now().microsecondsSinceEpoch}';
     await createLabelModalRobot.enterNewLabelName(newLabelName);
     await createLabelModalRobot.tapPositiveActionButton(LabelActionType.create);
     await _expectLabelAsToEmailToastMessageSuccessVisible(
diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index 55e59152f..339e9a533 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -952,6 +952,9 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         pressEmailAction(actionType, presentationEmail);
         break;
       case EmailActionType.labelAs:
+        if (!isLabelAvailable) {
+          return;
+        }
         mailboxDashBoardController.openAddLabelToEmailDialogModal(
           email: presentationEmail,
           onCreateANewLabelAction: () {
diff --git a/lib/features/labels/presentation/label_controller.dart b/lib/features/labels/presentation/label_controller.dart
index 160ef8d53..95822deff 100644
--- a/lib/features/labels/presentation/label_controller.dart
+++ b/lib/features/labels/presentation/label_controller.dart
@@ -107,10 +107,10 @@ class LabelController extends BaseController
   }
 
   @override
-  CreateNewLabelInteractor? get createNewLabelInteractor => _createNewLabelInteractor;
+  CreateNewLabelInteractor get createNewLabelInteractor => _createNewLabelInteractor!;
 
   @override
-  EditLabelInteractor? get editLabelInteractor => _editLabelInteractor;
+  EditLabelInteractor get editLabelInteractor => _editLabelInteractor!;
 
   DeleteALabelInteractor? get deleteALabelInteractor => _deleteALabelInteractor;
 
@@ -221,9 +221,6 @@ class LabelController extends BaseController
     bool shouldPop = false,
   }) {
     toastManager.showMessageFailure(failure);
-    if (shouldPop) {
-      popBack();
-    }
   }
 
   void _addLabelToList(Label newLabel) {
diff --git a/lib/features/labels/presentation/mixin/label_modal_mixin.dart b/lib/features/labels/presentation/mixin/label_modal_mixin.dart
index 59e39ad14..983a836d9 100644
--- a/lib/features/labels/presentation/mixin/label_modal_mixin.dart
+++ b/lib/features/labels/presentation/mixin/label_modal_mixin.dart
@@ -12,8 +12,8 @@ import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 mixin LabelModalMixin {
   List<Label> get labels;
   ImagePaths get imagePaths;
-  CreateNewLabelInteractor? get createNewLabelInteractor;
-  EditLabelInteractor? get editLabelInteractor;
+  CreateNewLabelInteractor get createNewLabelInteractor;
+  EditLabelInteractor get editLabelInteractor;
 
   Future<dynamic> openCreateNewLabelModal({
     required AccountId accountId,
@@ -26,8 +26,8 @@ mixin LabelModalMixin {
         accountId: accountId,
         imagePaths: imagePaths,
         verifyNameInteractor: verifyNameInteractor,
-        createNewLabelInteractor: createNewLabelInteractor!,
-        editLabelInteractor: editLabelInteractor!,
+        createNewLabelInteractor: createNewLabelInteractor,
+        editLabelInteractor: editLabelInteractor,
       ),
       dialogLabel: 'create-new-label-modal',
     );
@@ -47,8 +47,8 @@ mixin LabelModalMixin {
         selectedLabel: selectedLabel,
         actionType: LabelActionType.edit,
         verifyNameInteractor: verifyNameInteractor,
-        createNewLabelInteractor: createNewLabelInteractor!,
-        editLabelInteractor: editLabelInteractor!,
+        createNewLabelInteractor: createNewLabelInteractor,
+        editLabelInteractor: editLabelInteractor,
       ),
       dialogLabel: 'edit-label-modal',
     );
diff --git a/lib/features/labels/presentation/widgets/create_new_label_modal.dart b/lib/features/labels/presentation/widgets/create_new_label_modal.dart
index 8bfd89f09..ca983dd95 100644
--- a/lib/features/labels/presentation/widgets/create_new_label_modal.dart
+++ b/lib/features/labels/presentation/widgets/create_new_label_modal.dart
@@ -422,6 +422,9 @@ class _CreateNewLabelModalState extends State<CreateNewLabelModal> {
   }
 
   void _onCloseModal() {
+    if (_createLabelStateNotifier.value == LabelPositiveButtonState.progressing) {
+      return;
+    }
     _clearInputFocus();
     popBack();
   }
diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart
index 43b0200bd..6457cafe8 100644
--- a/lib/features/thread/presentation/thread_view.dart
+++ b/lib/features/thread/presentation/thread_view.dart
@@ -651,11 +651,16 @@ class ThreadView extends GetWidget<ThreadController>
           dashboardController.toggleLabelToEmail(emailId, label, isSelected);
         },
         onCreateANewLabelAction: () {
+          final emailId = email.id;
+          if (emailId == null) {
+            logWarning('ThreadView::onCreateANewLabelAction: Email id is null');
+            return;
+          }
           dashboardController.labelController.handleLabelActionType(
             actionType: LabelActionType.create,
             accountId: dashboardController.accountId.value,
             onLabelActionCallback: (label) =>
-                dashboardController.toggleLabelToEmail(email.id!, label, true),
+                dashboardController.toggleLabelToEmail(emailId, label, true),
           );
         },
       ),
diff --git a/lib/main/routes/dialog_router.dart b/lib/main/routes/dialog_router.dart
index e38b6d672..ef90bfb7b 100644
--- a/lib/main/routes/dialog_router.dart
+++ b/lib/main/routes/dialog_router.dart
@@ -41,8 +41,9 @@ class DialogRouter {
       );
 
       return returnedValue;
-    } catch (e) {
-      logWarning('DialogRouter::pushGeneralDialog: Exception = $e');
+    } catch (e, stackTrace) {
+      logWarning('DialogRouter::pushGeneralDialog: Exception = $e\n$stackTrace');
+      rethrow;
     } finally {
       if (PlatformInfo.isWeb) {
         _isMapDialogOpened.remove(routeName);
@@ -112,8 +113,9 @@ class DialogRouter {
         barrierLabel: dialogLabel,
         pageBuilder: (_, __, ___) => child,
       );
-    } catch (e) {
-      logWarning('DialogRouter::openDialogModal: Exception = $e');
+    } catch (e, stackTrace) {
+      logWarning('DialogRouter::openDialogModal: Exception = $e\n$stackTrace');
+      rethrow;
     } finally {
       if (PlatformInfo.isWeb && dialogLabel != null) {
         _isMapDialogOpened.remove(dialogLabel);