diff --git a/lib/features/app_layout/view/widgets/default_nav_bar.dart b/lib/features/app_layout/view/widgets/default_nav_bar.dart
index 9cc9ddd..c5140b1 100644
--- a/lib/features/app_layout/view/widgets/default_nav_bar.dart
+++ b/lib/features/app_layout/view/widgets/default_nav_bar.dart
@@ -27,9 +27,11 @@ class DefaultNavBar extends StatelessWidget {
               //   DevicesCubit.getInstance()
               //       .clearCategoriesSelection(context);
               // }
-              if (HomeCubit.getInstance().selectedRoom != null) {
-                HomeCubit.getInstance().unselectRoom();
-              }
+              // if (HomeCubit.getInstance().selectedRoom != null) {
+              //   HomeCubit.getInstance().unselectRoom();
+              // }
+
+              HomeCubit.getInstance().updatePageIndex(index);
             },
             currentIndex: HomeCubit.pageIndex,
             selectedItemColor: ColorsManager.primaryColor,
diff --git a/lib/services/api/network_exception.dart b/lib/services/api/network_exception.dart
index 4784fa9..36b9f9f 100644
--- a/lib/services/api/network_exception.dart
+++ b/lib/services/api/network_exception.dart
@@ -51,8 +51,15 @@ class ServerFailure extends Failure {
   }
 
   factory ServerFailure.fromResponse(int statusCode, dynamic response) {
-    if (statusCode == 400 || statusCode == 401 || statusCode == 403) {
+    if (statusCode == 401 || statusCode == 403) {
       return ServerFailure(response);
+    } else if (statusCode == 400) {
+      //response is list of errors
+      List<String> errors = [];
+      response.forEach((element) {
+        errors.add(element);
+      });
+      return ServerFailure(errors.join('\n'));
     } else if (statusCode == 404) {
       return ServerFailure("Your request not found, Please try later!");
     } else if (statusCode == 500) {