Moving exceptions to a more general location