diff --git a/lib/data/core/exception/error_const.dart b/lib/data/core/exception/error_const.dart
index c9909f63..11539d4d 100644
--- a/lib/data/core/exception/error_const.dart
+++ b/lib/data/core/exception/error_const.dart
@@ -30,7 +30,6 @@ const String alreadyLeaveAppliedError = 'already-applied';
 const String somethingWentWrongError = 'something-went-wrong';
 const String appleSigninError = 'apple-signin-error';
 
-
 //Exception: when user don't provide all the required information in fields,
 const String provideRequiredInformation = 'provide-required-information';
 
diff --git a/lib/data/services/account_service.dart b/lib/data/services/account_service.dart
index 7da2d710..26602e3d 100644
--- a/lib/data/services/account_service.dart
+++ b/lib/data/services/account_service.dart
@@ -42,16 +42,16 @@ class AccountService {
     if (userData != null) {
       await _setUserSession(authData.uid);
       return userData;
-    } else if(authData.email != null ){
+    } else if (authData.email != null) {
       final user = Account(
           uid: authData.uid,
           email: authData.email!,
           name: authData.displayName);
       await _accountsDb.doc(authData.uid).set(user);
       await _setUserSession(authData.uid);
-
       return user;
     }
+    return null;
   }
 
   Future<void> _setUserSession(String uid) async {
diff --git a/lib/ui/sign_in/bloc/sign_in_view_bloc.dart b/lib/ui/sign_in/bloc/sign_in_view_bloc.dart
index b6ae3803..7b3b3fce 100644
--- a/lib/ui/sign_in/bloc/sign_in_view_bloc.dart
+++ b/lib/ui/sign_in/bloc/sign_in_view_bloc.dart
@@ -52,7 +52,7 @@ class SignInBloc extends Bloc<SignInEvent, SignInState> {
       firebase_auth.User? authUser = await _authService.signInWithApple();
       if (authUser != null) {
         final Account? user = await _accountService.getAppleUser(authUser);
-        if(user == null) {
+        if (user == null) {
           emit(state.copyWith(
               appleSignInLoading: false, error: appleSigninError));
           return;
@@ -62,13 +62,13 @@ class SignInBloc extends Bloc<SignInEvent, SignInState> {
       } else {
         emit(state.copyWith(appleSignInLoading: false));
       }
-    } catch(e,stack) {
-      if(e is FirebaseAuthException && e.code == 'canceled') {
-        emit(state.copyWith(
-            appleSignInLoading: false));
+    } catch (e, stack) {
+      if (e is FirebaseAuthException && e.code == 'canceled') {
+        emit(state.copyWith(appleSignInLoading: false));
         return;
       }
-      FirebaseCrashlytics.instance.recordError(e, stack,reason: 'Apple Sign In Error');
+      FirebaseCrashlytics.instance
+          .recordError(e, stack, reason: 'Apple Sign In Error');
       emit(state.copyWith(
           appleSignInLoading: false, error: somethingWentWrongError));
     }
diff --git a/lib/ui/sign_in/sign_in_screen.dart b/lib/ui/sign_in/sign_in_screen.dart
index b99746af..6295c26a 100644
--- a/lib/ui/sign_in/sign_in_screen.dart
+++ b/lib/ui/sign_in/sign_in_screen.dart
@@ -63,7 +63,9 @@ class SignInScreenState extends State<SignInScreen> {
               listener: (context, state) {
                 if (state.error != null) {
                   if (state.error == appleSigninError) {
-                    showSnackBar(context: context, msg: context.l10n.apple_sign_in_error_message);
+                    showSnackBar(
+                        context: context,
+                        msg: context.l10n.apple_sign_in_error_message);
                   } else {
                     showSnackBar(context: context, error: state.error);
                   }