fixed exception juggling

A few exceptions still weren't centralized and there were conflicting references