Update to new exceptions