Use new function overflow_error in a few places