Refactored class definition.
Ignore error when tenant id/name was not given.