Merge "Null check file.list() results."