Fixed exception errors