Moving exceptions to separate module