Skiping asignment of Thread.current[:tenant_id] if it's nil