Switch more exceptions to use new util method.