Update throw_exception from master.