Added guard around null tenant