Oraganized the exceptions again