1 files changed, 3 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginExternalAuthServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginExternalAuthServiceImpl.java
index c31ef75e..d0450966 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginExternalAuthServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginExternalAuthServiceImpl.java
@@ -126,8 +126,9 @@ public class LoginExternalAuthServiceImpl implements LoginExternalAuthService {
 				if (appuser == null && userHasRoleFunctions(user)) {
 					createUserIfNecessary(user);
 				} else {
-					appuser.setLastLoginDate(new Date());
-
+                    if (appuser != null) {
+                        appuser.setLastLoginDate(new Date());
+                    }
 					// update the last logged in date for the user
 					dataAccessService.saveDomainObject(appuser, additionalParams);
 				}