diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
index c06d7208ed..7d39098897 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
@@ -7,7 +7,6 @@ import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.codec.Base64;
@@ -119,7 +118,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
         try {
             tokenRepository.updateToken(newToken.getSeries(), newToken.getTokenValue(), newToken.getDate());
             addCookie(newToken, request, response);
-        } catch (DataAccessException e) {
+        } catch (Exception e) {
             logger.error("Failed to update token: ", e);
             throw new RememberMeAuthenticationException("Autologin failed due to data access problem");
         }
@@ -142,7 +141,7 @@ public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeSe
         try {
             tokenRepository.createNewToken(persistentToken);
             addCookie(persistentToken, request, response);
-        } catch (DataAccessException e) {
+        } catch (Exception e) {
             logger.error("Failed to save persistent token ", e);
         }
     }