added exception models, removed logic from exception block