Fix for identity resolution in case context is null
Merge pull request #1 from parshim/master

Fix for identity resolution in case context is null