[UPDATE] use error handling in evaluation