diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index 23fbfaf07..d0db4cf16 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -395,7 +395,7 @@ public class Authenticate extends FreemarkerHttpServlet {
 
 		// If the user is a self-editor, send them to their home page.
 		User user = getLoggedInUser(request);
-		if ( Integer.toString(AuthRole.USER.level()) == user.getRoleURI() ) {
+		if ( user != null && user.getRoleURI() != null && user.getRoleURI().equals( Integer.toString(AuthRole.USER.level()) )){
 			UserDao userDao = getUserDao(request);
 			if (userDao != null) {
 				List<String> uris = userDao.getIndividualsUserMayEditAs(user