diff --git a/ChangeLog b/ChangeLog
index 6ebfc2314..9ec30eb61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-23	Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailFolder.m - added safety
+	checks around the ACL code so we don't crash if
+	we can't read the ACLs.
+
 2012-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreFolder.m (-getPidTagAccessLevel)
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 1bf4c6a30..5e6348bde 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -1171,6 +1171,9 @@ static NSString *defaultUserID =  @"anyone";
   NSEnumerator *usernames;
   NSString *username;
 
+  if ([mailboxACL isKindOfClass: [NSException class]])
+    return;
+
   newIMAPAcls = [NSMutableDictionary new];
 
   usernames = [[mailboxACL allKeys] objectEnumerator];
@@ -1193,6 +1196,9 @@ static NSString *defaultUserID =  @"anyone";
   NSString *newUsername;
   NSString *imapPrefix;
 
+  if ([mailboxACL isKindOfClass: [NSException class]])
+    return;
+  
   imapPrefix = [[[context activeUser] domainDefaults] imapAclGroupIdPrefix];
   
   newIMAPAcls = [[NSMutableDictionary alloc] init];