diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 63cd8c976..87f98c81f 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -1090,7 +1090,7 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
         // We check if our entry is a group. If so, we set the
         // 'isGroup' custom attribute.
         gclasses = [groupObjectClasses objectEnumerator];
-        while (gclass = [gclasses nextObject])
+        while ((gclass = [gclasses nextObject]))
          if ([classes containsObject: [gclass lowercaseString]])
            {
              [ldifRecord setObject: [NSNumber numberWithInt: 1]
diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m
index e62ef9ecf..214cd46ba 100644
--- a/SoObjects/SOGo/SOGoUserManager.m
+++ b/SoObjects/SOGo/SOGoUserManager.m
@@ -537,6 +537,9 @@ static Class NSNullK;
   SOGoSystemDefaults *sd;
   BOOL checkOK;
 
+  if (!_login)
+    return NO;
+
   sd = [SOGoSystemDefaults sharedSystemDefaults];
 
   username = _login;