diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index a07b8a4fa..7b5de1707 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -97,12 +97,12 @@ class LdapDiscoveryPage extends Form
      *
      * @param bool $suppressArrayNotation
      *
-     * @return array|null
+     * @return array
      */
     public function getValues($suppressArrayNotation = false)
     {
         if (! isset($this->discovery) || ! $this->discovery->isSuccess()) {
-            return null;
+            return [];
         }
         $disc = $this->discovery;
         return array(