Fix for identity resolution in case context is null