Update throw_exception from develop.