Use key().id_or_name() instead of key().name()
These two cases were introduced after the previous refactoring was
done and did not follow the new behavior.
Patch by: Sverre Rabbelier
class GenericViewError(Exception): """A problem in a generic view.""" pass