Moving exceptions to clean method