Fix the exceptions