diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
index 3f1702defe..dc550d8c04 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java
@@ -14,6 +14,8 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
 
     public void onApplicationEvent(AuthenticationFailureBadCredentialsEvent e) {
         WebAuthenticationDetails auth = (WebAuthenticationDetails) e.getAuthentication().getDetails();
-        loginAttemptService.loginFailed(auth.getRemoteAddress());
+        if (auth != null) {
+            loginAttemptService.loginFailed(auth.getRemoteAddress());
+        }
     }
 }
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
index dff78ac0db..77a7b3ca6f 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationSuccessEventListener.java
@@ -14,6 +14,8 @@ public class AuthenticationSuccessEventListener implements ApplicationListener<A
 
     public void onApplicationEvent(AuthenticationSuccessEvent e) {
         WebAuthenticationDetails auth = (WebAuthenticationDetails) e.getAuthentication().getDetails();
-        loginAttemptService.loginSucceeded(auth.getRemoteAddress());
+        if (auth != null) {
+            loginAttemptService.loginSucceeded(auth.getRemoteAddress());
+        }
     }
 }