missing empty checks in tenant getter functions