diff --git a/lib/Autodiscover.php b/lib/Autodiscover.php
--- a/lib/Autodiscover.php
+++ b/lib/Autodiscover.php
@@ -236,12 +236,16 @@
         // connect to LDAP
         if (!$this->ldap->connect()) {
             $this->error("Storage connection failed");
+            return false;
         }
 
         // bind as the service user
         if (!$this->ldap->bind($this->_ldap_bind_dn, $this->_ldap_bind_pw)) {
             $this->error("Storage connection failed");
+            return false;
         }
+
+        return true;
     }
 
     /**