fix the exceptions