Updated to reflect exception changes.