Minor update of path & error handling

Still runs too slowly.