Made a check if a identity exists.
Merge branch 'tp'