Merge "Avoid crashing when a directory does not exist" into pi-dev