diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart
index 784c2f44..4c961843 100644
--- a/lib/core/api/api_client.dart
+++ b/lib/core/api/api_client.dart
@@ -211,7 +211,7 @@ class ApiClientImp implements ApiClient {
         }
 
         // body['TokenID'] = "@dm!n";
-        // body['PatientID'] = 226077;
+        // body['PatientID'] = 5422188;
         // body['PatientID'] = 53320;
         // body['PatientTypeID'] = 1;
         // body['PatientOutSA'] = 0;
diff --git a/lib/features/immediate_livecare/immediate_livecare_view_model.dart b/lib/features/immediate_livecare/immediate_livecare_view_model.dart
index e2e8d2cb..57bf6553 100644
--- a/lib/features/immediate_livecare/immediate_livecare_view_model.dart
+++ b/lib/features/immediate_livecare/immediate_livecare_view_model.dart
@@ -135,7 +135,9 @@ class ImmediateLiveCareViewModel extends ChangeNotifier {
 
     result.fold(
       (failure) async {
-        onError!(failure.message);
+        if(onError != null) {
+          onError(failure.message);
+        }
       },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
diff --git a/lib/presentation/book_appointment/search_doctor_by_name.dart b/lib/presentation/book_appointment/search_doctor_by_name.dart
index 4e9f1435..f1f391b0 100644
--- a/lib/presentation/book_appointment/search_doctor_by_name.dart
+++ b/lib/presentation/book_appointment/search_doctor_by_name.dart
@@ -218,7 +218,7 @@ class _SearchDoctorByNameState extends State<SearchDoctorByName> {
                                                         bookAppointmentsViewModel: bookAppointmentsViewModel,
                                                         isDoctorNameSearch: true,
                                                       ).paddingSymmetrical(16.h, 0.h).onPress(() async {
-                                                        if (bookAppointmentsVM.filteredDoctorList[index].clinicID == 17 && getIt.get<AppState>().getAuthenticatedUser()!.age! < 12) {
+                                                        if (getIt.get<AppState>().isAuthenticated && bookAppointmentsVM.filteredDoctorList[index].clinicID == 17 && getIt.get<AppState>().getAuthenticatedUser()!.age! < 12) {
                                                           bookAppointmentsViewModel.setProjectID(bookAppointmentsVM.filteredDoctorList[index].projectID.toString());
                                                           bookAppointmentsViewModel.setSelectedClinic(GetClinicsListResponseModel(
                                                               clinicID: bookAppointmentsVM.filteredDoctorList[index].clinicID,
diff --git a/lib/presentation/book_appointment/widgets/doctor_card.dart b/lib/presentation/book_appointment/widgets/doctor_card.dart
index d2f431a9..23a9cbcd 100644
--- a/lib/presentation/book_appointment/widgets/doctor_card.dart
+++ b/lib/presentation/book_appointment/widgets/doctor_card.dart
@@ -186,7 +186,7 @@ class DoctorCard extends StatelessWidget {
                 if (isDoctorNameSearch && doctorsListResponseModel.clinicID == 17) {
                   GetClinicsListResponseModel selectedClinic = GetClinicsListResponseModel(
                       clinicID: doctorsListResponseModel.clinicID, clinicDescription: doctorsListResponseModel.clinicName, isLiveCareClinicAndOnline: false, liveCareServiceID: 0, liveCareClinicID: 0);
-                  if (getIt.get<AppState>().getAuthenticatedUser()!.age! > 12) {
+                  if (getIt.get<AppState>().isAuthenticated && getIt.get<AppState>().getAuthenticatedUser()!.age! > 12) {
                     bookAppointmentsViewModel.setProjectID(doctorsListResponseModel.projectID.toString());
                     bookAppointmentsViewModel.setSelectedClinic(selectedClinic);
                     bookAppointmentsViewModel.setIsChiefComplaintsListLoading(true);
diff --git a/lib/splashPage.dart b/lib/splashPage.dart
index fe223fc2..cf407d41 100644
--- a/lib/splashPage.dart
+++ b/lib/splashPage.dart
@@ -116,8 +116,8 @@ class _SplashScreenState extends State<SplashPage> {
       logLevel: LogLevel.Error, // Optional: Set the log level (Verbose, Debug, Info, Warning, Error, None)
     );
 
-    Clarity.initialize(context, config);
-    
+    Clarity.initialize(getIt.get<NavigationService>().navigatorKey.currentContext!, config);
+
     // Set initial app context tags
     try {
       final appState = getIt.get<AppState>();