Match changed local directory layout; add more error handling