Set Primary Identifier only if it exists

[shaardie]

This patch ensures that the primary identifier is only set, if it is present and not None.

All Submissions:

• [X] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• [X] Have you added an explanation of what problem you are trying to solve with this PR?
• [X] Have you added information on what your changes do and why you chose this as your solution?
• [ ] Have you written new tests for your changes?
• [X] Does your submission pass tests?
• [X] This project follows PEP8 style guide. Have you run your code against the 'flake8' linter?