Merge "Don't reference directory that doesn't exist"