Fix the point and add error case.