Add checks to make sure we only blow away valid PBI dirs