diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
index 1a7b5f85f06842af664bf16ec4923045e57ee2cd..384e9a4f5484e3824cc8f9c339122ccc4c6ad7be 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
@@ -197,7 +197,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
         {
             LdapDAO.checkLdapResult(e.getResultCode(), 
                     e.getDiagnosticMessage());
-            return null; //TODO
+            throw new RuntimeException("Unexpected LDAP exception", e);
         } 
     }
     
@@ -303,8 +303,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
         catch (LDAPException e)
         {
             LdapDAO.checkLdapResult(e.getResultCode(), e.getDiagnosticMessage());
+            throw new RuntimeException("Unexpected LDAP exception", e);
         }
-        return null;
     }
 
 
@@ -788,8 +788,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
                 for (SearchResultEntry result : results.getSearchEntries())
                 {
                     String groupName = result.getAttributeValue("cn");
+                    groups.add(new Group(groupName, null));
                 }
-
             } 
             catch (LDAPException e)
             {
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index 8c21c14eba6ee1109091573b76def642ac8ba24e..be6d8173c2631200986636bc0edb394cc86d570c 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -342,8 +342,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
         catch (LDAPException e)
         {
             LdapDAO.checkLdapResult(e.getResultCode(), e.getDiagnosticMessage());
+            throw new RuntimeException("Unexpected LDAP exception", e);
         }
-        return false;
     }
     
     /**