diff --git a/lib/features/auth/login_page.dart b/lib/features/auth/login_page.dart
index eaa6193..8ee84d0 100644
--- a/lib/features/auth/login_page.dart
+++ b/lib/features/auth/login_page.dart
@@ -101,8 +101,15 @@ class _LoginPageState extends State<LoginPage> {
       await apiClient.login(_usernameController.text, _passwordController.text);
 
       // Save credentials for next time
-      await _saveCredentials(apiClient.refreshToken!);
-      await _navigateToHome();
+      if (apiClient.refreshToken == null) {
+        _log.warning('Login failed, refreshToken is null');
+        setState(() {
+          _errorMessage = 'Login failed.\nRefresh token is null';
+        });
+      } else {
+        await _saveCredentials(apiClient.refreshToken!);
+        await _navigateToHome();
+      }
     } catch (e) {
       _log.warning('Login failed', e);
       setState(() {