diff --git a/src/lua/core/filesystem.lua b/src/lua/core/filesystem.lua
index 8b5ef74..2214488 100644
--- a/src/lua/core/filesystem.lua
+++ b/src/lua/core/filesystem.lua
@@ -123,7 +123,7 @@ function filesystem.register(basePath, uuid)
   end
   function fs.list(path)
     checkArg(1, path, "string")
-    return native.fs_list(realpath(path)) --TODO: Test, check if dirs get / at end
+    return native.fs_list(realpath(path)) or {} --TODO: Test, check if dirs get / at end
   end
   function fs.lastModified(path)
     checkArg(1, path, "string")
@@ -159,4 +159,4 @@ function filesystem.register(basePath, uuid)
   return modules.component.api.register(uuid, "filesystem", fs)
 end
 
-return filesystem
\ No newline at end of file
+return filesystem