Fixed error handling in geo ip lookup closes #2011

Mind taking a look at this @aranhoide?
Is this removal of the `MasqueradeListener` integral to this fix?  Is this just undoing a previous attempt at fixing this?  Or is this an unrelated change?  (Not opposing, just trying to understand.)