diff --git a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
index ee40de87..dc4b8a5f 100644
--- a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
+++ b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
@@ -246,12 +246,18 @@ class VisitorPasswordBloc
           passwordName: event.passwordName);
       if (res == true) {
         emit(SuccessState());
-        emit(TableLoaded(data));
+      }else {
+        throw Exception('Failed to create password');
       }
+      emit(TableLoaded(data));
 
     } catch (e) {
       emit(FailedState(e.toString()));
-    }
+      Navigator.pop(event.context!);
+      stateDialog(
+          context: event.context!,
+          message: e.toString(),
+          title: 'Something Wrong');    }
   }
 
   //offline password
@@ -266,10 +272,18 @@ class VisitorPasswordBloc
           passwordName: event.passwordName);
       if (res == true) {
         emit(SuccessState());
-        emit(TableLoaded(data));
+      }else {
+        throw Exception('Failed to create password');
       }
+      emit(TableLoaded(data));
+
     } catch (e) {
       emit(FailedState(e.toString()));
+      Navigator.pop(event.context!);
+      stateDialog(
+          context: event.context!,
+          message: e.toString(),
+          title: 'Something Wrong');
     }
   }
 
@@ -288,11 +302,18 @@ class VisitorPasswordBloc
       );
       if (res == true) {
         emit(SuccessState());
-        emit(TableLoaded(data));
+      }else {
+        throw Exception('Failed to create password');
       }
+      emit(TableLoaded(data));
+
     } catch (e) {
       emit(FailedState(e.toString()));
-    }
+      Navigator.pop(event.context!);
+      stateDialog(
+          context: event.context!,
+          message: e.toString(),
+          title: 'Something Wrong');       }
   }
 
   void selectDevice(