Restructure the exceptions