Fix cases where folder may not exist