Merge "Added check for user info is not null"