fix binary operator extraction + upgrade error msg