Updates to file and folder location validation

this one is for you @william-ferguson-au ;-)