more consistent management of exceptions