removed extraneous error-raising