Merge "Check that dir name is a pid before attempting to read"