Restructure the exceptions.