#290: revert to throw method