[Fixes] Update exceptions