3 files changed, 7 insertions, 1 deletions

diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 71ebaf5a..22dbb721 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -93,7 +93,10 @@ function list.run(...)
    
    local results = {}
    for _, tree in ipairs(trees) do
-      search.manifest_search(results, path.rocks_dir(tree), query)
+      local ok, err, errcode = search.manifest_search(results, path.rocks_dir(tree), query)
+      if not ok then
+         return nil, err
+      end
    end
    util.title("Installed rocks:", flags["porcelain"])
    search.print_results(results, flags["porcelain"])
diff --git a/test/testing.lua b/test/testing.lua
index b34e9ab2..8d8b3af2 100644
--- a/test/testing.lua
+++ b/test/testing.lua
@@ -112,6 +112,7 @@ local tests = {
    fail_lint_invalid = function() return run "$luarocks lint invalid" end,
    fail_show_invalid = function() return run "$luarocks show invalid" end,
    fail_new_version_invalid = function() return run "$luarocks new_version invalid" end,
+   fail_list_invalidtree = function() return run "$luarocks --tree=/some/invalid/tree list" end,
    fail_inexistent_dir = function()
       -- Unix only?
       return run "mkdir idontexist; cd idontexist; rmdir ../idontexist; $luarocks; err=$?; cd ..; return $err"
diff --git a/test/testing.sh b/test/testing.sh
index 45f16c0c..af2ec45e 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -367,6 +367,8 @@ fail_lint_invalid() { $luarocks lint invalid; }
 fail_show_invalid() { $luarocks show invalid; }
 fail_new_version_invalid() { $luarocks new_version invalid; }
 
+fail_list_invalidtree() { $luarocks --tree=/some/invalid/tree list; }
+
 fail_inexistent_dir() { mkdir idontexist; cd idontexist; rmdir ../idontexist; $luarocks; err=$?; cd ..; return $err; }
 
 fail_make_norockspec() { $luarocks make; }