Credential Support for the JPAIdentityStore
add null checks