Updated error path replace