Fix performance tweak when current_tenant is nil but super would return the right tenant. #62

Followup of bd82e69b4e470c111df8ee2532b8296800be8893