updated Exception names