Moved exceptions to own packages