Small refactoring of geo terms, improved error messages.