diff --git a/data/web/autoconfig.php b/data/web/autoconfig.php
index fdf70a77b..901a245d6 100644
--- a/data/web/autoconfig.php
+++ b/data/web/autoconfig.php
@@ -24,10 +24,10 @@ else {
 }
 
 if (isset($_GET['emailaddress'])) {
-   $emailaddress_at = strpos($_GET['emailaddress'], '@');
-   if ($emailaddress_at !== FALSE) {
-      $domain = substr($_GET['emailaddress'], $emailaddress_at + 1);
-   }
+  $emailaddress_at = strpos($_GET['emailaddress'], '@');
+  if ($emailaddress_at !== FALSE) {
+    $domain = substr($_GET['emailaddress'], $emailaddress_at + 1);
+  }
 }
 
 header('Content-Type: application/xml');
@@ -56,7 +56,7 @@ header('Content-Type: application/xml');
 
 <?php
 $records = dns_get_record('_pop3s._tcp.' . $domain, DNS_SRV); // check if POP3 is announced as "not provided" via SRV record
-if (count($records) == 0 || $records[0]['target'] != '') { ?>
+if ($records === FALSE || count($records) == 0 || $records[0]['target'] != '') { ?>
       <incomingServer type="pop3">
          <hostname><?=$autodiscover_config['pop3']['server']; ?></hostname>
          <port><?=$autodiscover_config['pop3']['port']; ?></port>
@@ -67,7 +67,7 @@ if (count($records) == 0 || $records[0]['target'] != '') { ?>
 <?php } ?>
 <?php
 $records = dns_get_record('_pop3._tcp.' . $domain, DNS_SRV); // check if POP3 is announced as "not provided" via SRV record
-if (count($records) == 0 || $records[0]['target'] != '') { ?>
+if ($records === FALSE || count($records) == 0 || $records[0]['target'] != '') { ?>
       <incomingServer type="pop3">
          <hostname><?=$autodiscover_config['pop3']['server']; ?></hostname>
          <port><?=$autodiscover_config['pop3']['tlsport']; ?></port>