diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
index dba5c94c..6cbf81b9 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
@@ -70,7 +70,7 @@ public class MindmapServiceImpl
     }
 
     private boolean isAdmin(User user) {
-        return (user != null && user.getEmail().equals(adminUser));
+        return user != null && user.getEmail() != null && user.getEmail().equals(adminUser);
     }
 
     @Override
@@ -292,7 +292,8 @@ public class MindmapServiceImpl
         this.adminUser = adminUser;
     }
 
-    @NotNull  public String getAdminUser() {
+    @NotNull
+    public String getAdminUser() {
         return adminUser;
     }
 }