make exception check broader