Added handling of null in userIdentity role creation... need more love...