diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index 9b95689679c..de57af450e4 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -168,6 +168,9 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    if (path.find('\0') != std::string::npos)
+        return "path contains a NUL character";
+
     std::list<FileWithDetails> filesSorted;
 
     std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
@@ -285,6 +288,9 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
     if (path.empty())
         return "no path specified";
 
+    if (path.find('\0') != std::string::npos)
+        return "path contains a NUL character";
+
     std::string corrected_path = path;
     if (endsWith(corrected_path, '/'))
         corrected_path.erase(corrected_path.end() - 1);