Move exceptions to their respective methods