@pcragone I like the idea of your patch. I also agree with @laurens that this line needs to be changed. In its current form it will raise an exception always unless you set the tenant_required flag. I'll pull this in and make the required change.

Thanks for this