Added more redundant path checks