Merge "Handle a possible weird case for empty directories table"