Fixed another infinite recusion on init error, this time with Tenant entity facade isntances