diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 23334bd09c3..33d38274e48 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -367,6 +367,7 @@ Thank you!
     Michele Bergonzoni <bergonz@labs.it>
     Miguel A.L. Paraz <map@iphil.net>
     Mike Groeneweg <mikeg@scorpion.murdoch.edu.au>
+    Mike Lothian <mike@fireburn.co.uk>
     Mike Mitchell <mike.mitchell@sas.com>
     Mikio Kishi <mkishi@104.net>
     Milen Pankov <mail@milen.pankov.eu>
diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 6dfa92f3cfd..90a5dc676c2 100644
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -111,7 +111,9 @@ ConfigParser::strtokFile()
             fclose(wordFile);
             wordFile = nullptr;
             fromFile = 0;
-            return nullptr;
+            t = buf;
+            *t = '\0';
+            // and resume parsing post-"file" input, if any
         } else {
             char *t2, *t3;
             t = buf;
diff --git a/test-suite/squidconf/bad-acl-dstdomain-dupe.conf b/test-suite/squidconf/bad-acl-dstdomain-dupe.conf
index 52f0a39c925..9807cf104b3 100644
--- a/test-suite/squidconf/bad-acl-dstdomain-dupe.conf
+++ b/test-suite/squidconf/bad-acl-dstdomain-dupe.conf
@@ -17,3 +17,5 @@ acl test41 dstdomain .d.example.com .example.com
 acl test42 dstdomain .example.com .e.example.com
 
 acl test51 dstdomain example.com example.net .
+
+acl test61 dstdomain "bad-acl-dstdomain-dupe.domains" after-file.example.com
diff --git a/test-suite/squidconf/bad-acl-dstdomain-dupe.conf.instructions b/test-suite/squidconf/bad-acl-dstdomain-dupe.conf.instructions
index ff18d9c66a7..e94a11534d2 100644
--- a/test-suite/squidconf/bad-acl-dstdomain-dupe.conf.instructions
+++ b/test-suite/squidconf/bad-acl-dstdomain-dupe.conf.instructions
@@ -28,4 +28,8 @@ WARNING: Ignoring earlier .d.example.com because it is covered by .example.com
 WARNING: Ignoring .e.example.com because it is already covered by .example.com
     advice: Remove value .e.example.com from the ACL
     acl name: test42
+
+WARNING: Ignoring after-file.example.com because it is already covered by .example.com
+    advice: Remove value after-file.example.com from the ACL
+    acl name: test61
 END
diff --git a/test-suite/squidconf/bad-acl-dstdomain-dupe.domains b/test-suite/squidconf/bad-acl-dstdomain-dupe.domains
new file mode 100644
index 00000000000..c30ac315107
--- /dev/null
+++ b/test-suite/squidconf/bad-acl-dstdomain-dupe.domains
@@ -0,0 +1 @@
+.example.com