Bug 4775 - handle cases when tenant-id is an empty string