Refactoring of exceptions + geo.