Fix for identity resolution in case context is null

Some plugins request identity resolution with conext = null