Update to handle exceptions thrown by newer Moose.