Update to the utilities to catch errors