diff --git a/dnsrecon.py b/dnsrecon.py
index 881f80e2..a5211873 100755
--- a/dnsrecon.py
+++ b/dnsrecon.py
@@ -359,7 +359,7 @@ def brute_srv(res, domain, verbose=False):
         '_ldap._tcp.gc._msdcs.', '_kerberos._tcp.dc._msdcs.', '_kpasswd._tcp.', '_kpasswd._udp.',
         '_imap._tcp.', '_imaps._tcp.', '_submission._tcp.', '_pop3._tcp.', '_pop3s._tcp.',
         '_caldav._tcp.', '_caldavs._tcp.', '_carddav._tcp.', '_carddavs._tcp.',
-        '_x-puppet._tcp.', '_x-puppet-ca._tcp.']
+        '_x-puppet._tcp.', '_x-puppet-ca._tcp.', '_autodiscover._tcp.']
 
     try:
         for srvtype in srvrcd:
@@ -970,6 +970,9 @@ def general_enum(res, domain, do_axfr, do_google, do_bing, do_spf, do_whois, do_
 
         except dns.resolver.NoAnswer:
             print_error("Could not Resolve NS Records for {0}".format(domain))
+        except dns.resolver.NoNameservers:
+            print_error("All nameservers failed to answer the NS query for {0}".format(domain))
+            sys.exit(1)
 
         # Enumerate MX Records
         try:
@@ -1694,4 +1697,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-