Merge "Added null check for listFiles() result to prevent crash at iterating through...